Merge remote-tracking branch 'remotes/origin/ignite-59' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd862850 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd862850 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd862850 Branch: refs/heads/ignite-36 Commit: cd862850f17429b9d9f7bbf89f111b62034e65cc Parents: 4a64d43 3f7dc7d Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Jan 19 19:35:40 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Jan 19 19:35:40 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/cd862850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
