Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into gg-9998
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/510864f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/510864f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/510864f1 Branch: refs/heads/gg-9998 Commit: 510864f1916c233224f636fea06203733e250028 Parents: 4714b49 0dfb5c0 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Apr 1 11:00:41 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Apr 1 11:00:41 2015 +0300 ---------------------------------------------------------------------- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-- .../ignite/internal/GridKernalContextImpl.java | 3 +- .../org/apache/ignite/internal/IgnitionEx.java | 10 +-- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 ++++++++++++++++++-- .../processors/cache/GridCacheProcessor.java | 8 +- .../distributed/near/GridNearAtomicCache.java | 3 +- .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 4 + .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../managers/GridNoopManagerSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java | 9 +- .../IgniteCacheSystemTransactionsSelfTest.java | 38 +++------ ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../OptimizedMarshallerNodeFailoverTest.java | 71 ++++++++++++++- .../spi/GridSpiLocalHostInjectionTest.java | 2 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 28 +++--- .../junits/GridTestKernalContext.java | 2 +- .../junits/IgniteTestResources.java | 8 +- .../junits/spi/GridSpiAbstractTest.java | 13 +-- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala | 24 +++--- .../commands/tasks/VisorTasksCommand.scala | 6 +- 29 files changed, 269 insertions(+), 105 deletions(-) ----------------------------------------------------------------------
