Merge remote-tracking branch 'remotes/origin/ignite-968' 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/2b052c29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b052c29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b052c29 Branch: refs/heads/ignite-389 Commit: 2b052c29c2bef2a04b01253cbcb9d35f7e2b6d6d Parents: 4701d6d f711773 Author: sboikov <semen.boi...@inria.fr> Authored: Tue Jun 2 20:57:38 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Tue Jun 2 20:57:38 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 4 +- .../processors/cache/CacheMetricsImpl.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 13 +++--- .../GridDhtPartitionsExchangeFuture.java | 46 ++++++++++---------- 4 files changed, 36 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
