Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7e0a19d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7e0a19d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7e0a19d4 Branch: refs/heads/ignite-286 Commit: 7e0a19d432b21b0d9561ecf2dcb51b4b11af2ec2 Parents: 6932fc6 f0000bd Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 28 20:18:25 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 28 20:18:25 2015 +0700 ---------------------------------------------------------------------- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 38 +++++++------- .../distributed/near/GridNearLockRequest.java | 54 ++++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
