Merge branch 'ignite-1.5' into ignite-1956
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b9b6c61 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b9b6c61 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b9b6c61 Branch: refs/heads/ignite-1956 Commit: 4b9b6c619a6972a8327981b40a8730dc6ac64631 Parents: 1e023b0 722aacf Author: vozerov-gridgain <[email protected]> Authored: Thu Nov 26 16:52:19 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Nov 26 16:52:19 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLockFuture.java | 1 + .../near/GridNearTxFinishFuture.java | 14 +- .../processors/cache/GridCacheStopSelfTest.java | 143 +++++++++++++++++-- 3 files changed, 140 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
