Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b7dcb8a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b7dcb8a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b7dcb8a Branch: refs/heads/ignite-141-2 Commit: 6b7dcb8a20b506b0aecd5bd3efdbe7cbab1c4c8c Parents: b8c1544 dab66dc Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Mar 10 14:38:31 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Mar 10 14:38:31 2015 +0300 ---------------------------------------------------------------------- .../ignite/configuration/HadoopConfiguration.java | 17 ++++++++++------- .../processors/hadoop/HadoopProcessor.java | 4 +++- .../HadoopClientProtocolEmbeddedSelfTest.java | 3 ++- .../processors/hadoop/HadoopGroupingTest.java | 3 ++- .../hadoop/HadoopJobTrackerSelfTest.java | 4 +++- .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 3 ++- .../hadoop/HadoopSortingExternalTest.java | 3 ++- .../processors/hadoop/HadoopSortingTest.java | 3 ++- .../hadoop/HadoopTaskExecutionSelfTest.java | 4 +++- .../HadoopExternalTaskExecutionSelfTest.java | 3 ++- .../ignite/testsuites/IgniteHadoopTestSuite.java | 6 +++--- 11 files changed, 34 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
