Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-286
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/679196c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/679196c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/679196c4 Branch: refs/heads/ignite-286 Commit: 679196c4e4248edd1754452b35091289b0e31bb6 Parents: 91d3763 d125eb6 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 28 14:44:00 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 28 14:44:00 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridJobContextImpl.java | 7 +- .../distributed/dht/GridDhtLockRequest.java | 38 ++++---- .../distributed/dht/GridDhtTxPrepareFuture.java | 10 ++- .../distributed/near/GridNearLockRequest.java | 54 ++++++------ .../ignite/internal/util/GridJavaProcess.java | 4 + .../ignite/internal/visor/cache/VisorCache.java | 92 +++++++++++--------- .../visor/node/VisorBasicConfiguration.java | 11 +++ .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 30 ++++--- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../config/VisorConfigurationCommand.scala | 1 + .../scala/org/apache/ignite/visor/visor.scala | 11 +++ pom.xml | 5 +- 13 files changed, 160 insertions(+), 110 deletions(-) ----------------------------------------------------------------------
