Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/245f4676 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/245f4676 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/245f4676 Branch: refs/heads/ignite-688 Commit: 245f46765b673d3a45300874781a898c9ad321fd Parents: 59d9374 fd9cdff Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Apr 9 13:54:34 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Apr 9 13:54:34 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/ClusterMetricsSnapshot.java | 2 +- .../processors/cache/GridCacheIoManager.java | 87 +++++++----- .../processors/cache/GridCacheMessage.java | 7 + .../GridCachePartitionExchangeManager.java | 136 ++++++++++++++++++- .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../GridDhtPartitionsAbstractMessage.java | 15 +- .../IgniteCacheAtomicNodeJoinTest.java | 44 ++++++ .../IgniteCacheNodeJoinAbstractTest.java | 109 +++++++++++++++ .../distributed/IgniteCacheTxNodeJoinTest.java | 38 ++++++ .../IgniteCacheFailoverTestSuite.java | 4 + 11 files changed, 410 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
