# Merge remote-tracking branch 'remotes/origin/master' into ignite-41
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3e628796 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e628796 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e628796 Branch: refs/heads/ignite-41 Commit: 3e62879636f67ccd12b42746defaa0adfd0319e3 Parents: 736dcc1 3032bee Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 19 11:08:33 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 19 11:08:33 2014 +0300 ---------------------------------------------------------------------- .../optimized-classnames.previous.properties | 30621 ----------------- .../optimized/optimized-classnames.properties | 30621 ----------------- .../gridgain/grid/kernal/visor/VisorJob.java | 6 +- .../grid/kernal/visor/cache/VisorCache.java | 4 +- .../cache/VisorCacheAggregatedMetrics.java | 417 +- .../kernal/visor/cache/VisorCacheMetrics.java | 176 +- .../kernal/visor/cache/VisorCacheMetrics2.java | 218 - .../cache/VisorCacheMetricsCollectorTask.java | 104 +- .../cache/VisorCacheQueryAggregatedMetrics.java | 129 - .../visor/cache/VisorCacheQueryMetrics.java | 44 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../VisorNodeConfigurationCollectorJob.java | 2 +- .../grid/kernal/visor/util/VisorTaskUtils.java | 42 + .../core/src/main/resources/gridgain.properties | 2 +- .../commands/cache/VisorCacheCommand.scala | 127 +- .../visor/commands/vvm/VisorVvmCommand.scala | 9 +- .../gridgain/visor/VisorRuntimeBaseSpec.scala | 1 - .../org/gridgain/visor/VisorTextTableSpec.scala | 3 +- .../visor/commands/VisorArgListSpec.scala | 3 +- .../commands/VisorFileNameCompleterSpec.scala | 4 +- .../commands/alert/VisorAlertCommandSpec.scala | 5 +- .../cache/VisorCacheClearCommandSpec.scala | 9 +- .../commands/cache/VisorCacheCommandSpec.scala | 6 +- .../cache/VisorCacheCompactCommandSpec.scala | 9 +- .../config/VisorConfigurationCommandSpec.scala | 6 +- .../cswap/VisorCacheSwapCommandSpec.scala | 6 +- .../deploy/VisorDeployCommandSpec.scala | 3 +- .../disco/VisorDiscoveryCommandSpec.scala | 2 +- .../events/VisorEventsCommandSpec.scala | 3 +- .../visor/commands/gc/VisorGcCommandSpec.scala | 3 +- .../commands/help/VisorHelpCommandSpec.scala | 3 +- .../commands/kill/VisorKillCommandSpec.scala | 3 +- .../commands/log/VisorLogCommandSpec.scala | 3 +- .../commands/mem/VisorMemoryCommandSpec.scala | 3 +- .../commands/open/VisorOpenCommandSpec.scala | 1 + .../commands/start/VisorStartCommandSpec.scala | 3 +- .../commands/tasks/VisorTasksCommandSpec.scala | 11 +- .../commands/vvm/VisorVvmCommandSpec.scala | 3 +- .../testsuites/VisorConsoleSelfTestSuite.scala | 13 +- pom.xml | 7 +- 40 files changed, 520 insertions(+), 62117 deletions(-) ----------------------------------------------------------------------
