Merge branches 'ignite-329' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-329
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49fa33dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49fa33dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49fa33dd Branch: refs/heads/sprint-2 Commit: 49fa33ddd94f2161e746279490063ae06dea5cb1 Parents: c96bf16 dab66dc Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Mar 10 17:47:05 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Mar 10 17:47:05 2015 +0700 ---------------------------------------------------------------------- bin/include/target-classpath.bat | 2 +- bin/include/target-classpath.sh | 2 +- .../configuration/HadoopConfiguration.java | 17 +++++----- .../ignite/internal/util/IgniteUtils.java | 12 +------ .../ignite/testframework/GridTestUtils.java | 13 +------- .../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 +- .../testsuites/IgniteHadoopTestSuite.java | 6 ++-- pom.xml | 33 ++++++++++++++++++++ 16 files changed, 71 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
