Merge branch ignite-477 into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/21cfc8da Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/21cfc8da Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/21cfc8da Branch: refs/heads/ignite-30 Commit: 21cfc8da70bf745b1cd9a7ac7d26ff75e063f41d Parents: fd011e2 dc8c4a9 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Apr 7 19:11:45 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Apr 7 19:11:45 2015 -0700 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLockFuture.java | 10 +++- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +++++++++++--------- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- 4 files changed, 39 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
