Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-297
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f303a4f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f303a4f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f303a4f3 Branch: refs/heads/ignite-281 Commit: f303a4f3d16692e5446dea383f2c9f2afc73dbed Parents: 344be34 510fd17 Author: sboikov <semen.boi...@inria.fr> Authored: Wed Feb 18 19:26:44 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Wed Feb 18 19:26:44 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtCacheAdapter.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 44 +++---- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 100 +++++++-------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 128 +++++++++---------- 5 files changed, 126 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f303a4f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------
