Merge branch 'sprint-1' into ignite-49
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e28980d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e28980d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e28980d Branch: refs/heads/ignite-49 Commit: 0e28980d37c9abd2362610ce4ec00225cb30d0e5 Parents: 503ad78 b7db215 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jan 21 09:20:38 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Jan 21 09:20:38 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 2 +- .../main/java/org/apache/ignite/CacheLock.java | 86 --------- .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheLock.java | 62 +++++++ .../processors/cache/CacheLockAsyncImpl.java | 141 +++++++++++++++ .../processors/cache/CacheLockImpl.java | 177 +++++++++++++++++++ .../processors/cache/IgniteCacheProxy.java | 104 +---------- .../cache/GridCacheAbstractFullApiSelfTest.java | 56 +++--- .../GridCacheMultiNodeLockAbstractTest.java | 61 ++++--- .../dht/GridCacheColocatedDebugTest.java | 17 +- .../near/GridCachePartitionedLockSelfTest.java | 17 +- .../GridCacheLocalMultithreadedSelfTest.java | 48 +++-- 12 files changed, 493 insertions(+), 279 deletions(-) ----------------------------------------------------------------------
