You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/24 10:22:22 UTC
[24/50] [abbrv] ignite git commit: Merge branch
ignite-1.5-tx-futs-opts into ignite-1.5
Merge branch ignite-1.5-tx-futs-opts into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/07f5a62e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/07f5a62e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/07f5a62e
Branch: refs/heads/ignite-1924
Commit: 07f5a62ec8e496a9a43e802f3f7bf5efc1dc2f9a
Parents: 15877a8 388c857
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Nov 23 09:44:43 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Nov 23 09:44:43 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtGetFuture.java | 24 +-
.../distributed/dht/GridDhtLockFuture.java | 77 +-
.../colocated/GridDhtColocatedLockFuture.java | 595 ++++++++-------
.../distributed/near/GridNearLockFuture.java | 739 ++++++++++---------
.../distributed/near/GridNearLockMapping.java | 6 +-
5 files changed, 751 insertions(+), 690 deletions(-)
----------------------------------------------------------------------