Merge remote-tracking branch 'remotes/apache-main/master' into ignite-1258
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ceda2afe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ceda2afe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ceda2afe Branch: refs/heads/ignite-1258 Commit: ceda2afe5fcf586523ab8cfe30ae987e32ae6bb3 Parents: dd12aac 653d411 Author: Denis Magda <dma...@gridgain.com> Authored: Fri Aug 21 17:30:05 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Aug 21 17:30:05 2015 +0300 ---------------------------------------------------------------------- .../distributed/GridDistributedCacheEntry.java | 4 +- .../cache/local/GridLocalCacheEntry.java | 4 +- .../service/GridServiceProcessor.java | 5 +++ .../GridCacheMultiNodeLockAbstractTest.java | 41 +++++++++++++++++++- ...idCachePartitionedMultiNodeLockSelfTest.java | 8 +--- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +--- .../IgniteCacheFailoverTestSuite2.java | 2 + 7 files changed, 57 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
