Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-gg-10411
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9372147a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9372147a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9372147a Branch: refs/heads/ignite-gg-10411 Commit: 9372147a218d7390b7e7a8aab25936091206c46d Parents: dbd8047 ae188c7 Author: ptupitsyn <[email protected]> Authored: Tue Jun 16 17:59:20 2015 +0300 Committer: ptupitsyn <[email protected]> Committed: Tue Jun 16 17:59:20 2015 +0300 ---------------------------------------------------------------------- .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 87 ++++++++++++++------ .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +++- ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 ++ .../cache/GridCacheVersionMultinodeTest.java | 8 +- .../IgniteCacheClientNodeConcurrentStart.java | 14 +++- .../distributed/IgniteCacheManyClientsTest.java | 69 ++++++++++++---- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +-------- 9 files changed, 166 insertions(+), 83 deletions(-) ----------------------------------------------------------------------
