Merge branches 'ignite-sprint-4' and 'ignite-sprint-4-pull-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4-pull-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7ea55cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7ea55cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7ea55cf Branch: refs/heads/ignite-471 Commit: c7ea55cf11e46c670adea8aa9d6031e187f66105 Parents: 452c6ef 51dc6aa Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Apr 28 13:07:01 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Apr 28 13:07:01 2015 +0300 ---------------------------------------------------------------------- .../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 +- 8 files changed, 101 insertions(+), 56 deletions(-) ----------------------------------------------------------------------
