Merge remote-tracking branch 'remotes/origin/ignite-835' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22341a9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22341a9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22341a9a Branch: refs/heads/ignite-836_2 Commit: 22341a9ad6e0c7627ffab26ba63c3f8ed3ace9c0 Parents: 5f8925b 96ff8f2 Author: sboikov <sboi...@gridgain.com> Authored: Wed May 13 13:50:48 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed May 13 13:50:48 2015 +0300 ---------------------------------------------------------------------- .../dht/GridDhtTransactionalCacheAdapter.java | 9 ++-- .../distributed/GridCacheLockAbstractTest.java | 2 - ...achePartitionedNearDisabledLockSelfTest.java | 47 ++++++++++++++++++++ .../GridCacheReplicatedLockSelfTest.java | 5 +++ .../testsuites/IgniteCacheTestSuite2.java | 1 + 5 files changed, 57 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
