ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/2] ignite git commit: Merge branch 'ignite-2343' of https://github.com/iveselovskiy/ignite into ignite-2343
Date Mon, 25 Jan 2016 08:49:43 GMT
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 <vozerov@gridgain.com>
Authored: Mon Jan 25 10:26:33 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
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(-)
----------------------------------------------------------------------



Mime
View raw message