Merge branch 'ignite-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/3bf90194 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bf90194 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bf90194 Branch: refs/heads/ignite-49 Commit: 3bf90194247e60cb9100117a72d806891847ac47 Parents: d699216 cd86285 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Jan 20 12:14:34 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Jan 20 12:14:34 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/CacheLock.java | 86 ++++++++++++++++++++ .../java/org/apache/ignite/IgniteCache.java | 23 +++++- .../processors/cache/IgniteCacheProxy.java | 83 +++++++++++++------ .../processors/cache/GridCacheAdapter.java | 20 ++++- .../cache/GridCacheBasicApiAbstractTest.java | 80 ++++++++++++++++++ 5 files changed, 264 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bf90194/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
