Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 62065176BC for ; Thu, 9 Apr 2015 12:34:16 +0000 (UTC) Received: (qmail 744 invoked by uid 500); 9 Apr 2015 12:34:16 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 671 invoked by uid 500); 9 Apr 2015 12:34:16 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 633 invoked by uid 99); 9 Apr 2015 12:34:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 12:34:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Apr 2015 12:34:15 +0000 Received: (qmail 99606 invoked by uid 99); 9 Apr 2015 12:33:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 12:33:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 542D2DFF99; Thu, 9 Apr 2015 12:33:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 12:34:07 -0000 Message-Id: In-Reply-To: <44c6697d259e4f499b0c726d244dbe09@git.apache.org> References: <44c6697d259e4f499b0c726d244dbe09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-624 X-Virus-Checked: Checked by ClamAV on apache.org 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-80 Commit: 71439bc0e5040b9df0b3e27e5632133049bc4432 Parents: c2c4da4 5e9addb Author: S.Vladykin Authored: Wed Apr 8 14:37:41 2015 +0300 Committer: S.Vladykin 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(-) ----------------------------------------------------------------------