Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71439bc0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71439bc0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71439bc0 Branch: refs/heads/ignite-30 Commit: 71439bc0e5040b9df0b3e27e5632133049bc4432 Parents: c2c4da4 5e9addb Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Apr 8 14:37:41 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Apr 8 14:37:41 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 +++----- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheAggregatedMetrics.java | 38 +- .../visor/cache/VisorCacheConfiguration.java | 17 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 ++- .../cache/VisorCacheMetricsCollectorTask.java | 59 ++- .../visor/cache/VisorCacheStopTask.java | 69 +++ .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 423 +++++++++++-------- .../commands/cache/VisorCacheStopCommand.scala | 145 +++++++ 11 files changed, 653 insertions(+), 333 deletions(-) ----------------------------------------------------------------------
