Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8db3d476 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8db3d476 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8db3d476 Branch: refs/heads/ignite-752 Commit: 8db3d476a04a52c4aee10b4fddc3cde618802d3f Parents: 123efaf f557728 Author: Denis Magda <dma...@gridgain.com> Authored: Sun Jul 19 13:32:05 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Sun Jul 19 13:32:05 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 +- .../plugin/security/SecurityPermission.java | 7 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 8 +- .../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 +++++ 18 files changed, 447 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8db3d476/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------
