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 77A3918199 for ; Thu, 21 Jan 2016 13:16:19 +0000 (UTC) Received: (qmail 84380 invoked by uid 500); 21 Jan 2016 13:16:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84305 invoked by uid 500); 21 Jan 2016 13:16:19 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 84286 invoked by uid 99); 21 Jan 2016 13:16:19 -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, 21 Jan 2016 13:16:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 42FEBE0098; Thu, 21 Jan 2016 13:16:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 21 Jan 2016 13:16:20 -0000 Message-Id: <636d855d3d1b4c009528a5367c9d0c0d@git.apache.org> In-Reply-To: <1d4be726320440baab69410017065bfb@git.apache.org> References: <1d4be726320440baab69410017065bfb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] ignite git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5bb1fb86 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5bb1fb86 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5bb1fb86 Branch: refs/heads/master Commit: 5bb1fb86b5ef84a2007e8205a05414e17891d6ca Parents: 7a660d7 340658d Author: sboikov Authored: Thu Jan 21 16:15:49 2016 +0300 Committer: sboikov Committed: Thu Jan 21 16:15:49 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/visor/cache/VisorCache.java | 12 +++++--- .../visor/cache/VisorCacheConfiguration.java | 31 +++++++++++++++----- .../visor/node/VisorNodeDataCollectorJob.java | 18 +++++++++++- 3 files changed, 49 insertions(+), 12 deletions(-) ----------------------------------------------------------------------