Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into
ignite-gg-9998
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15b45a63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15b45a63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15b45a63
Branch: refs/heads/ignite-gg-9998
Commit: 15b45a635e5ea42f69970b11d02fb5326291f586
Parents: 7621aae d125eb6
Author: ivasilinets <[email protected]>
Authored: Tue Apr 28 14:41:01 2015 +0300
Committer: ivasilinets <[email protected]>
Committed: Tue Apr 28 14:41:01 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
