Merge branch 'ignite-298' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e7463d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e7463d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e7463d1 Branch: refs/heads/ignite-187 Commit: 4e7463d1d2d5eeffecb7ede458597ed86aadaebc Parents: 47539d8 388da76 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Feb 27 16:51:05 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Feb 27 16:51:05 2015 +0700 ---------------------------------------------------------------------- .../visor/node/VisorBasicConfiguration.java | 17 --- .../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 +- 7 files changed, 173 insertions(+), 142 deletions(-) ----------------------------------------------------------------------
