Merge remote-tracking branch 'remotes/origin/master' into ignite-1534-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2029b7b1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2029b7b1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2029b7b1 Branch: refs/heads/ignite-1534-1 Commit: 2029b7b191b348d38e7c53885929e137fdef5473 Parents: 638decb b08e0b2 Author: sboikov <[email protected]> Authored: Thu Oct 1 11:52:05 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Oct 1 11:52:05 2015 +0300 ---------------------------------------------------------------------- .../cloud/TcpDiscoveryCloudIpFinderSelfTest.java | 2 ++ .../java/org/apache/ignite/internal/IgniteKernal.java | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 ++ .../cache/IgniteCacheAtomicPutAllFailoverSelfTest.java | 4 ++++ .../cache/IgniteCacheP2pUnmarshallingErrorTest.java | 7 +++++++ .../IgniteCacheP2pUnmarshallingRebalanceErrorTest.java | 12 ++++++------ ...hePartitionedAtomicQueueCreateMultiNodeSelfTest.java | 4 ++++ ...idCachePartitionedOffHeapValuesQueueApiSelfTest.java | 4 ++++ .../GridCachePartitionedSetFailoverSelfTest.java | 4 ++++ .../distributed/IgniteCacheAtomicNodeRestartTest.java | 8 ++++++++ .../distributed/dht/IgniteCrossCacheTxSelfTest.java | 6 +++--- ...NearEnabledFairAffinityMultiNodeFullApiSelfTest.java | 4 ++++ 12 files changed, 49 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
