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