Merge remote-tracking branch 'remotes/origin/ignite-59' into ignite-137
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885e070e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885e070e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885e070e Branch: refs/heads/ignite-125 Commit: 885e070e7a48911b099e1a05689c22a214a5adea Parents: ed524e9 6badd2b Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue Jan 27 18:41:44 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue Jan 27 18:41:44 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheLockImpl.java | 36 ++++++++++-- .../processors/cache/IgniteCacheProxy.java | 2 +- .../cache/GridCacheBasicApiAbstractTest.java | 62 ++++++++++++-------- .../near/GridCachePartitionedBasicApiTest.java | 4 +- .../GridCacheReplicatedBasicApiTest.java | 4 +- .../local/GridCacheLocalBasicApiSelfTest.java | 4 +- 6 files changed, 77 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/885e070e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
