Merge remote-tracking branch 'remotes/origin/master' into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7e7c469 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7e7c469 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7e7c469 Branch: refs/heads/ignite-1121 Commit: c7e7c4696a00ae33992672cd5fab03d2ce95b6ed Parents: 18a3e05 f0d24f6 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 17 12:45:36 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 17 12:45:36 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 12 ++ .../processors/cache/GridCacheContext.java | 45 +++-- .../processors/cache/GridCacheMvccManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 53 ++++++ .../distributed/dht/GridDhtTopologyFuture.java | 14 -- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 31 +--- .../cache/transactions/IgniteTxManager.java | 4 +- .../distributed/IgniteCache150ClientsTest.java | 1 + .../IgniteCacheClientReconnectTest.java | 175 +++++++++++++++++++ .../IgniteCacheServerNodeConcurrentStart.java | 96 ++++++++++ .../testframework/junits/GridAbstractTest.java | 5 + .../testsuites/IgniteCacheTestSuite2.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 - .../testsuites/IgniteClientNodesTestSuite.java | 42 +++++ 16 files changed, 439 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7e7c469/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
