Merge branches 'ignite-757' and 'ignite-sprint-4' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25879005 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25879005 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25879005 Branch: refs/heads/ignite-286 Commit: 25879005c01b99077f4421780cebc9cfb553eb6c Parents: 876430d d125eb6 Author: anovikov <anovi...@gridgain.com> Authored: Tue Apr 28 19:45:11 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Tue Apr 28 19:45:11 2015 +0700 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
