Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bfe74edf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bfe74edf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bfe74edf Branch: refs/heads/ignite-1537 Commit: bfe74edfc2002acc5ba32d9c8a943f74543496f2 Parents: abc4f83 722aacf Author: sboikov <[email protected]> Authored: Thu Nov 26 16:43:08 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Nov 26 16:43:08 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLockFuture.java | 1 + .../near/GridNearTxFinishFuture.java | 14 +- .../processors/cache/GridCacheStopSelfTest.java | 143 +++++++++++++++++-- 3 files changed, 140 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
