Merge remote-tracking branch 'remotes/origin/ignite-59' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79894103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79894103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79894103 Branch: refs/heads/ignite-36 Commit: 798941038b92ae4a3fc873bf6f0b358fc239a030 Parents: f10f5db 7f36224 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Jan 21 19:13:59 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Jan 21 19:13:59 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/CacheLock.java | 25 ++-- .../processors/cache/CacheLockAsyncImpl.java | 141 ----------------- .../processors/cache/CacheLockImpl.java | 31 +--- .../cache/GridCacheAbstractFullApiSelfTest.java | 23 +-- .../GridCacheMultiNodeLockAbstractTest.java | 150 +------------------ .../dht/GridCacheColocatedDebugTest.java | 9 +- .../near/GridCachePartitionedLockSelfTest.java | 16 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 10 -- .../GridCacheLocalMultithreadedSelfTest.java | 119 --------------- 9 files changed, 25 insertions(+), 499 deletions(-) ----------------------------------------------------------------------
