Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a57707f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a57707f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a57707f6 Branch: refs/heads/ignite-gg-10576 Commit: a57707f6ef387ea6f48fd878747e8c5044e7758e Parents: 0b25ec2 c044bb8 Author: Denis Magda <dma...@gridgain.com> Authored: Wed Jul 22 15:49:04 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Jul 22 15:49:04 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/pom.xml | 13 -------- .../processors/cache/GridCacheMvccManager.java | 14 +++++++++ .../distributed/dht/GridDhtTxFinishFuture.java | 13 +++++++- .../GridDhtPartitionsExchangeFuture.java | 10 +++++-- .../near/GridNearOptimisticTxPrepareFuture.java | 4 ++- .../GridNearPessimisticTxPrepareFuture.java | 2 +- .../near/GridNearTxFinishFuture.java | 17 ++++++++++- .../cache/transactions/IgniteTxManager.java | 5 ++-- .../cache/GridCachePutAllFailoverSelfTest.java | 3 ++ .../GridCacheAbstractNodeRestartSelfTest.java | 9 ++++++ ...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++++++++++++++++++++ .../GridCachePartitionedFailoverSelfTest.java | 5 ---- ...ePartitionedOptimisticTxNodeRestartTest.java | 12 +++++++- .../IgniteCacheFailoverTestSuite2.java | 4 +++ .../testsuites/IgniteCacheRestartTestSuite.java | 5 ++-- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 ++++ .../org/apache/ignite/spark/IgniteContext.scala | 14 +++++++++ 17 files changed, 135 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
