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 8B352183A4 for ; Mon, 25 Jan 2016 08:49:43 +0000 (UTC) Received: (qmail 87412 invoked by uid 500); 25 Jan 2016 08:49:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87376 invoked by uid 500); 25 Jan 2016 08:49:43 -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 87367 invoked by uid 99); 25 Jan 2016 08:49:43 -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; Mon, 25 Jan 2016 08:49:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B70BDFF96; Mon, 25 Jan 2016 08:49:43 +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: Mon, 25 Jan 2016 08:49:43 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: Merge branch 'ignite-2343' of https://github.com/iveselovskiy/ignite into ignite-2343 Repository: ignite Updated Branches: refs/heads/ignite-2343 [created] 009421ecc Merge branch 'ignite-2343' of https://github.com/iveselovskiy/ignite into ignite-2343 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6da42b4c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6da42b4c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6da42b4c Branch: refs/heads/ignite-2343 Commit: 6da42b4c18ad0021635cd5582fcb4727bf8d1988 Parents: 5f4a113 9a8ba90 Author: vozerov-gridgain Authored: Mon Jan 25 10:26:33 2016 +0300 Committer: vozerov-gridgain Committed: Mon Jan 25 10:26:33 2016 +0300 ---------------------------------------------------------------------- .../processors/hadoop/v2/HadoopV2Context.java | 5 ++-- .../processors/hadoop/v2/HadoopV2MapTask.java | 27 +++++++------------- 2 files changed, 12 insertions(+), 20 deletions(-) ----------------------------------------------------------------------