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 5A79217553 for ; Fri, 8 Jan 2016 08:47:53 +0000 (UTC) Received: (qmail 31687 invoked by uid 500); 8 Jan 2016 08:47:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31644 invoked by uid 500); 8 Jan 2016 08:47:53 -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 31634 invoked by uid 99); 8 Jan 2016 08:47:53 -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, 08 Jan 2016 08:47:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 13D0BE0AC4; Fri, 8 Jan 2016 08:47:53 +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: Fri, 08 Jan 2016 08:47:57 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] ignite git commit: Merge branch 'ignite-1.5.2' into ignite-1.5.3 Merge branch 'ignite-1.5.2' into ignite-1.5.3 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fc48a842 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fc48a842 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fc48a842 Branch: refs/heads/ignite-1.5.3 Commit: fc48a8429a84ef6c87ed3225a218d7d3ae617e14 Parents: 090a5de 86c4816 Author: vozerov-gridgain Authored: Fri Jan 8 11:48:42 2016 +0400 Committer: vozerov-gridgain Committed: Fri Jan 8 11:48:42 2016 +0400 ---------------------------------------------------------------------- .../internal/binary/BinaryClassDescriptor.java | 15 ++++++++++----- .../hadoop/fs/BasicHadoopFileSystemFactory.java | 19 ++++++++++++++++++- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 6 +++--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 7 ++++++- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 7 +++++++ 5 files changed, 44 insertions(+), 10 deletions(-) ----------------------------------------------------------------------