Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0000bde Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0000bde Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0000bde Branch: refs/heads/ignite-695 Commit: f0000bde9dfef2af51357434d3e1264ce5f572a4 Parents: e46bef0 d125eb6 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Apr 28 16:13:55 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Apr 28 16:13:55 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtLockRequest.java | 38 +++++++------- .../distributed/near/GridNearLockRequest.java | 54 ++++++++++---------- .../ignite/internal/util/GridJavaProcess.java | 4 ++ 3 files changed, 50 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
