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 A550817534 for ; Tue, 3 Mar 2015 12:58:16 +0000 (UTC) Received: (qmail 8055 invoked by uid 500); 3 Mar 2015 12:58:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8020 invoked by uid 500); 3 Mar 2015 12:58:07 -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 8011 invoked by uid 99); 3 Mar 2015 12:58:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 12:58:07 +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; Tue, 03 Mar 2015 12:57:40 +0000 Received: (qmail 6845 invoked by uid 99); 3 Mar 2015 12:57:38 -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; Tue, 03 Mar 2015 12:57:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B37CCE107B; Tue, 3 Mar 2015 12:57:37 +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: Tue, 03 Mar 2015 12:57:58 -0000 Message-Id: <7cba72c22f974679bb77b009f7ab00fa@git.apache.org> In-Reply-To: <71820b8c73bb408ca67944485c0be52b@git.apache.org> References: <71820b8c73bb408ca67944485c0be52b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-237 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7fb3890c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7fb3890c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7fb3890c Branch: refs/heads/ignite-349 Commit: 7fb3890c609f4c04af9b057686dfc3706a50e59d Parents: 3bab015 4e7463d Author: ivasilinets Authored: Fri Feb 27 13:27:20 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 13:27:20 2015 +0300 ---------------------------------------------------------------------- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 17 --- .../node/VisorNodeEventsCollectorTask.java | 10 +- .../internal/visor/node/VisorNodeGcTask.java | 10 +- .../internal/visor/node/VisorNodePingTask.java | 10 +- .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 82 +++++++---- .../config/VisorConfigurationCommand.scala | 140 ++++++++++--------- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++++++--- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- 11 files changed, 193 insertions(+), 162 deletions(-) ----------------------------------------------------------------------