Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/add3600f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/add3600f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/add3600f Branch: refs/heads/ignite-107 Commit: add3600f29c5dcff5eb6cc14d7f7f8992ec5c62f Parents: 222721b cd86285 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jan 20 11:26:20 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jan 20 11:26:20 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/add3600f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
