Merge remote-tracking branch 'remotes/origin/sprint-3' into ignite-629-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c4bef11f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4bef11f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4bef11f Branch: refs/heads/gg-9998 Commit: c4bef11f380946ac2577ea6081aea72676126cb6 Parents: a1725e1 8e590f9 Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 30 11:53:41 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 30 11:53:41 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 15 +-- RELEASE_NOTES.txt | 20 ++- .../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 + .../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 +++ pom.xml | 22 ++- 29 files changed, 570 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4bef11f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ----------------------------------------------------------------------
