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/90b6303d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90b6303d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90b6303d Branch: refs/heads/ignite-45 Commit: 90b6303d2ca6fe5f4f0a1453e7e33f1eb314fb1a Parents: 65b0b95 4426dde Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Tue Mar 24 00:45:09 2015 -0700 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Tue Mar 24 00:45:09 2015 -0700 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLockFuture.java | 2 +- .../processors/cache/GridCacheLifecycleAwareSelfTest.java | 10 +++++----- .../junits/common/GridAbstractLifecycleAwareSelfTest.java | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
