Merge branches 'ignite-137' and 'ignite-59' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/1800ff6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1800ff6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1800ff6e Branch: refs/heads/ignite-125 Commit: 1800ff6eaba68e1e747b059a05e052da0cd85e7e Parents: f46ccf8 0357b74 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Jan 27 16:46:29 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Jan 27 16:46:29 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheLockImpl.java | 44 +++++++------------- .../processors/cache/IgniteCacheProxy.java | 3 -- .../transactions/IgniteTxConcurrency.java | 2 +- .../cache/GridCacheBasicApiAbstractTest.java | 4 +- .../GridCacheMultiNodeLockAbstractTest.java | 10 ++--- 5 files changed, 22 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1800ff6e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
