Merge branches 'ignite-544' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56fea8c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56fea8c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56fea8c5 Branch: refs/heads/ignite-341 Commit: 56fea8c5956a625f9a105a273308f06150f420fc Parents: 6198db7 aa09b3b Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Mar 24 23:27:15 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Mar 24 23:27:15 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 12 +++--- .../processors/cache/GridCacheStoreManager.java | 11 ++++-- .../dht/GridDhtAssignmentFetchFuture.java | 7 +++- .../distributed/dht/GridDhtLockFuture.java | 9 ++++- .../dht/GridDhtTransactionalCacheAdapter.java | 6 ++- .../distributed/dht/GridDhtTxLocalAdapter.java | 6 ++- .../dht/colocated/GridDhtColocatedCache.java | 5 +++ .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearLockFuture.java | 1 + .../distributed/near/GridNearLockRequest.java | 40 ++++++++++++++++---- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +-- .../IgniteCacheNoWriteThroughAbstractTest.java | 3 +- 12 files changed, 80 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
