Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/06002340 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/06002340 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/06002340 Branch: refs/heads/ignite-45 Commit: 0600234031ff8bc204a86f713a71ee215ccace17 Parents: 0317082 4bd4642 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Mar 24 10:08:06 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Mar 24 10:08:06 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtLockFuture.java | 4 ++++ .../cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
