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/23 09:47:54 UTC
[12/12] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-sql-opt
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-opt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d76ac9c1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d76ac9c1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d76ac9c1
Branch: refs/heads/ignite-sql-opt
Commit: d76ac9c1c188f7452ffb6be3194eaccfaf0dae1d
Parents: 570b480 96ae696
Author: sboikov <sb...@gridgain.com>
Authored: Mon Nov 23 11:47:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Nov 23 11:47:10 2015 +0300
----------------------------------------------------------------------
.../internal/portable/BinaryReaderExImpl.java | 226 +++---
.../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 +-
6 files changed, 887 insertions(+), 780 deletions(-)
----------------------------------------------------------------------