Merge remote-tracking branch 'remotes/origin/ignite-883_1' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3fe8ce5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3fe8ce5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3fe8ce5 Branch: refs/heads/ignite-929 Commit: e3fe8ce581b20d3e378876e3c5b94ff6e22baff8 Parents: abeddc9 eb0e2db Author: sboikov <sboi...@gridgain.com> Authored: Tue Jun 9 13:44:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jun 9 13:44:56 2015 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignment.java | 12 ++++++++++++ .../affinity/GridAffinityAssignmentCache.java | 4 ++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +++++- .../preloader/GridDhtPartitionsExchangeFuture.java | 14 +++++++++----- 4 files changed, 28 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
