Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7179D200B79 for ; Tue, 2 Aug 2016 09:41:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7066D160AB0; Tue, 2 Aug 2016 07:41:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D060D160AB8 for ; Tue, 2 Aug 2016 09:41:25 +0200 (CEST) Received: (qmail 88844 invoked by uid 500); 2 Aug 2016 07:41:25 -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 88466 invoked by uid 99); 2 Aug 2016 07:41:24 -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, 02 Aug 2016 07:41:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B9A7EEE20; Tue, 2 Aug 2016 07:41:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Tue, 02 Aug 2016 07:41:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/14] ignite git commit: Merge remote-tracking branch 'upstream/ignite-1.6.3-3343' into ignite-1.6.3-3343 archived-at: Tue, 02 Aug 2016 07:41:26 -0000 Merge remote-tracking branch 'upstream/ignite-1.6.3-3343' into ignite-1.6.3-3343 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9bb2c2cc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9bb2c2cc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9bb2c2cc Branch: refs/heads/ignite-3343 Commit: 9bb2c2cc77079a434b269d3b4da3a1eeb229d462 Parents: 2fa5b20 1f9125c Author: vozerov-gridgain Authored: Tue Aug 2 10:38:35 2016 +0300 Committer: vozerov-gridgain Committed: Tue Aug 2 10:38:35 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/igfs/IgfsImpl.java | 3 ++- .../ignite/internal/processors/igfs/IgfsModeResolver.java | 10 +++++----- .../apache/ignite/internal/processors/igfs/IgfsPaths.java | 6 +++--- .../apache/ignite/internal/processors/igfs/IgfsUtils.java | 2 -- .../apache/ignite/internal/visor/cache/VisorCacheV4.java | 2 +- .../internal/visor/node/VisorNodeDataCollectorJob.java | 4 ++-- .../processors/igfs/IgfsDualAbstractSelfTest.java | 1 + .../processors/igfs/IgfsModeResolverSelfTest.java | 6 ++++-- 8 files changed, 18 insertions(+), 16 deletions(-) ----------------------------------------------------------------------