Merge remote-tracking branch 'remotes/upstream/gridgain-7.6.1'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41f81da8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41f81da8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41f81da8 Branch: refs/heads/ignite-1232 Commit: 41f81da8f7efe629affc1cfae52ed1d8820a1043 Parents: 5b4ac37 8ce29a9 Author: Anton Vinogradov <[email protected]> Authored: Wed Jun 22 13:01:23 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Jun 22 13:01:23 2016 +0300 ---------------------------------------------------------------------- .../configuration/HadoopConfiguration.java | 35 +++++++ .../processors/hadoop/HadoopJobInfo.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 45 +++++++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 7 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../cluster/GridAddressResolverSelfTest.java | 97 ++++++++++++++++++++ .../vm/TcpDiscoveryVmIpFinderSelfTest.java | 75 +++++++++++++++ .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../processors/hadoop/HadoopClassLoader.java | 26 +++++- .../processors/hadoop/HadoopDefaultJobInfo.java | 8 +- .../hadoop/jobtracker/HadoopJobTracker.java | 14 ++- .../child/HadoopChildProcessRunner.java | 2 +- .../processors/hadoop/v2/HadoopV2Job.java | 14 ++- .../hadoop/HadoopClassLoaderTest.java | 2 +- .../processors/hadoop/HadoopSnappyTest.java | 2 +- .../processors/hadoop/HadoopTasksV1Test.java | 2 +- .../processors/hadoop/HadoopTasksV2Test.java | 2 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 2 +- .../collections/HadoopAbstractMapTest.java | 6 +- 19 files changed, 312 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
