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/056712bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/056712bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/056712bf Branch: refs/heads/ignite-4371 Commit: 056712bf946b326f8431b2e20f11eaafe7ff0dda Parents: 9a62d53 33e027d Author: sboikov <[email protected]> Authored: Thu Dec 15 12:15:44 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Dec 15 12:15:44 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/hadoop/HadoopJobProperty.java | 4 ++-- .../internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java | 2 +- .../internal/processors/hadoop/impl/HadoopTeraSortTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
