Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7908aea9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7908aea9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7908aea9 Branch: refs/heads/ignite-sprint-3 Commit: 7908aea91ad23d04efd1e6bbbc0ae796e72c0880 Parents: 8474a0a 5e9addb Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 9 09:02:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 9 09:02:56 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 +++----- .../cache/transactions/IgniteTxManager.java | 6 +- .../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 +++++++ 12 files changed, 657 insertions(+), 335 deletions(-) ----------------------------------------------------------------------
