Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-611
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46bb91a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46bb91a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46bb91a3 Branch: refs/heads/ignite-424 Commit: 46bb91a3ec135b743fc8a2bdaacac64afeb14940 Parents: 2289f64 bca4198 Author: ivasilinets <vasilinetc....@gmail.com> Authored: Mon Mar 30 23:02:49 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Mon Mar 30 23:02:49 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 15 +-- RELEASE_NOTES.txt | 20 ++- modules/core/pom.xml | 9 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../GridCacheAbstractFailoverSelfTest.java | 134 +++++-------------- .../GridCacheAbstractFailoverTxSelfTest.java | 110 +++++++++++++++ .../GridCacheInterceptorAbstractSelfTest.java | 2 + .../cache/IgniteCacheDynamicStopSelfTest.java | 19 +-- .../dht/GridCacheColocatedFailoverSelfTest.java | 2 +- .../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +++++++ ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 +++++ ...idCacheAtomicReplicatedFailoverSelfTest.java | 32 +++++ .../GridCachePartitionedFailoverSelfTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 2 +- .../IgniteCacheFailoverTestSuite.java | 13 +- modules/geospatial/README.txt | 15 +++ .../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 +- modules/hibernate/README.txt | 15 +++ modules/schedule/README.txt | 15 +++ parent/pom.xml | 3 +- pom.xml | 22 ++- 32 files changed, 588 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46bb91a3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java ----------------------------------------------------------------------
