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/0dd7e5d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dd7e5d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dd7e5d3 Branch: refs/heads/ignite-49 Commit: 0dd7e5d3426e72186ece8b1ac3ddf5dc8ccdfa91 Parents: ea7f525 f8ecd87 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jan 22 13:28:35 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jan 22 13:28:35 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCluster.java | 15 +- .../java/org/apache/ignite/IgniteEvents.java | 22 ++- .../main/java/org/apache/ignite/IgniteFs.java | 5 + .../java/org/apache/ignite/IgniteManaged.java | 18 ++- .../java/org/apache/ignite/IgniteMessaging.java | 5 +- .../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 + 20 files changed, 237 insertions(+), 522 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dd7e5d3/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
