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 C572C10550 for ; Fri, 10 Apr 2015 01:45:48 +0000 (UTC) Received: (qmail 87645 invoked by uid 500); 10 Apr 2015 01:45:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87618 invoked by uid 500); 10 Apr 2015 01:45:48 -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 87609 invoked by uid 99); 10 Apr 2015 01:45:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 01:45:48 +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; Fri, 10 Apr 2015 01:45:26 +0000 Received: (qmail 84975 invoked by uid 99); 10 Apr 2015 01:44:08 -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; Fri, 10 Apr 2015 01:44:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB9A9E025B; Fri, 10 Apr 2015 01:44:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 10 Apr 2015 01:44:17 -0000 Message-Id: <383cd154d0a8414caac13ac748e437a0@git.apache.org> In-Reply-To: <3ac9a52055d74c43affe0b07a7017d19@git.apache.org> References: <3ac9a52055d74c43affe0b07a7017d19@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-694 X-Virus-Checked: Checked by ClamAV on apache.org 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-674 Commit: 7908aea91ad23d04efd1e6bbbc0ae796e72c0880 Parents: 8474a0a 5e9addb Author: sboikov Authored: Thu Apr 9 09:02:56 2015 +0300 Committer: sboikov 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(-) ----------------------------------------------------------------------