Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-107
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b8131f23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b8131f23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b8131f23 Branch: refs/heads/sprint-1 Commit: b8131f235855cb158cf5bb10912dc8f8eb0738df Parents: c3b6487 74efcec Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 22 14:51:47 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 22 14:51:47 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/CacheFlag.java | 3 - .../java/org/apache/ignite/cache/CacheLock.java | 25 ++-- .../processors/cache/CacheLockAsyncImpl.java | 141 ----------------- .../processors/cache/CacheLockImpl.java | 31 +--- .../grid/cache/GridCacheConfiguration.java | 32 ++++ .../org/gridgain/grid/cache/GridCacheFlag.java | 3 - .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/IgniteCacheInvokeReadThroughTest.java | 121 +++++++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 23 +-- .../GridCacheMultiNodeLockAbstractTest.java | 150 +------------------ .../dht/GridCacheColocatedDebugTest.java | 9 +- .../near/GridCachePartitionedLockSelfTest.java | 16 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 10 -- .../GridCacheLocalMultithreadedSelfTest.java | 119 --------------- .../bamboo/GridDataGridTestSuite.java | 3 + 15 files changed, 185 insertions(+), 509 deletions(-) ----------------------------------------------------------------------
