Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7fb3890c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7fb3890c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7fb3890c Branch: refs/heads/sprint-2 Commit: 7fb3890c609f4c04af9b057686dfc3706a50e59d Parents: 3bab015 4e7463d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Feb 27 13:27:20 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Feb 27 13:27:20 2015 +0300 ---------------------------------------------------------------------- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 17 --- .../node/VisorNodeEventsCollectorTask.java | 10 +- .../internal/visor/node/VisorNodeGcTask.java | 10 +- .../internal/visor/node/VisorNodePingTask.java | 10 +- .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 82 +++++++---- .../config/VisorConfigurationCommand.scala | 140 ++++++++++--------- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++++++--- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- 11 files changed, 193 insertions(+), 162 deletions(-) ----------------------------------------------------------------------