Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0976cdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0976cdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0976cdd Branch: refs/heads/ignite-gg-9828 Commit: a0976cddc7433fb191247ecbd217d9cea6553b69 Parents: 1075459 6b7dcb8 Author: sboikov <sboi...@gridgain.com> Authored: Tue Mar 10 15:43:21 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Mar 10 15:43:21 2015 +0300 ---------------------------------------------------------------------- bin/include/target-classpath.bat | 2 +- bin/include/target-classpath.sh | 2 +- license/header-customisation.xml | 51 --------------- license/header.txt | 14 ---- modules/clients/src/test/keystore/generate.sh | 26 ++++---- .../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 | 67 +++++++++++++++++++- 19 files changed, 118 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0976cdd/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ----------------------------------------------------------------------
