Merge branch 'ignite-sprint-3' into ignite-598
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/481cc35d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/481cc35d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/481cc35d Branch: refs/heads/ignite-598 Commit: 481cc35d8c6d57d9139aa9a941f375620f79922c Parents: 3f2da5a 0dfb5c0 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Apr 1 09:19:45 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Apr 1 09:19:45 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481cc35d/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/481cc35d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ----------------------------------------------------------------------
