Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-1462
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6906408 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6906408 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6906408 Branch: refs/heads/ignite-1462 Commit: b690640858deea07545a6e5ef350b53028d2f8fe Parents: 582e00e b4c515e Author: Denis Magda <[email protected]> Authored: Mon Sep 14 15:31:09 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Mon Sep 14 15:31:09 2015 +0300 ---------------------------------------------------------------------- .../GridCacheVariableTopologySelfTest.java | 5 ++-- .../dht/GridCacheTxNodeFailureSelfTest.java | 19 +++++++++----- ...gniteAtomicLongChangingTopologySelfTest.java | 15 ++++------- .../stream/socket/SocketStreamerSelfTest.java | 27 +++++++++++++++----- .../IgniteCacheQueryNodeRestartSelfTest2.java | 2 ++ 5 files changed, 43 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
