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 9E7E8104DC for ; Tue, 28 Apr 2015 22:51:34 +0000 (UTC) Received: (qmail 13062 invoked by uid 500); 28 Apr 2015 22:51:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13028 invoked by uid 500); 28 Apr 2015 22:51:34 -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 12999 invoked by uid 99); 28 Apr 2015 22:51:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 22:51:34 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of root@apache.org designates 54.76.25.247 as permitted sender) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 22:51:10 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A48792AA8A for ; Tue, 28 Apr 2015 22:50:44 +0000 (UTC) Received: (qmail 9390 invoked by uid 99); 28 Apr 2015 22:50:41 -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, 28 Apr 2015 22:50:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5EA3E32BC; Tue, 28 Apr 2015 22:50:41 +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: Tue, 28 Apr 2015 22:51:12 -0000 Message-Id: <5772f18e59ad469b823213e2795746cb@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/50] incubator-ignite git commit: Merge branches 'ignite-sprint-4' and 'ignite-sprint-4-pull-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4-pull-1 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-sprint-4' and 'ignite-sprint-4-pull-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4-pull-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7ea55cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7ea55cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7ea55cf Branch: refs/heads/ignite-80 Commit: c7ea55cf11e46c670adea8aa9d6031e187f66105 Parents: 452c6ef 51dc6aa Author: Yakov Zhdanov Authored: Tue Apr 28 13:07:01 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Apr 28 13:07:01 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/visor/cache/VisorCache.java | 92 +++++++++++--------- .../visor/node/VisorBasicConfiguration.java | 11 +++ .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 30 ++++--- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +- .../config/VisorConfigurationCommand.scala | 1 + .../scala/org/apache/ignite/visor/visor.scala | 11 +++ pom.xml | 5 +- 8 files changed, 101 insertions(+), 56 deletions(-) ----------------------------------------------------------------------