Merge remote-tracking branch 'remotes/origin/sprint-3' into ignite-615-616
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ddf3748 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ddf3748 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ddf3748 Branch: refs/heads/ignite-615-616 Commit: 7ddf3748c27deb64add33a772a15531898983cbe Parents: 2335ef9 5657b41 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Mar 27 19:17:45 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Mar 27 19:17:45 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 134 +++++-------------- .../GridCacheAbstractFailoverTxSelfTest.java | 110 +++++++++++++++ .../GridCacheInterceptorAbstractSelfTest.java | 2 + .../dht/GridCacheColocatedFailoverSelfTest.java | 2 +- .../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +++++++ ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +++++ ...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +++++ .../GridCachePartitionedFailoverSelfTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 2 +- .../IgniteCacheFailoverTestSuite.java | 13 +- .../processors/hadoop/HadoopClassLoader.java | 21 ++- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 4 +- .../processors/hadoop/v2/HadoopDaemon.java | 125 +++++++++++++++++ .../processors/hadoop/v2/HadoopV2Job.java | 58 ++++++-- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +- .../hadoop/HadoopClassLoaderTest.java | 2 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +- 22 files changed, 480 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
