You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/05 14:16:33 UTC
[04/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-728' into ignite-728
Merge remote-tracking branch 'origin/ignite-728' into ignite-728
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ae6b031
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ae6b031
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ae6b031
Branch: refs/heads/ignite-630
Commit: 8ae6b0319db2e92d7316533d9946bba51d2174c1
Parents: b58e1ac ef7d011
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Apr 29 18:01:02 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Apr 29 18:01:02 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/Ignition.java | 44 ++++
.../ignite/internal/GridJobContextImpl.java | 7 +-
.../org/apache/ignite/internal/IgnitionEx.java | 165 +++++++++++++-
.../processors/cache/GridCacheMvccManager.java | 2 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 59 ++++-
.../distributed/dht/GridDhtLockFuture.java | 18 +-
.../distributed/dht/GridDhtLockRequest.java | 38 ++--
.../distributed/dht/GridDhtTxFinishFuture.java | 102 ++++++++-
.../cache/distributed/dht/GridDhtTxLocal.java | 6 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 23 ++
.../distributed/dht/GridDhtTxPrepareFuture.java | 10 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 7 +
.../distributed/near/GridNearLockRequest.java | 54 ++---
.../cache/distributed/near/GridNearTxLocal.java | 6 +
.../cache/transactions/IgniteInternalTx.java | 5 +
.../cache/transactions/IgniteTxAdapter.java | 10 +
.../cache/transactions/IgniteTxHandler.java | 57 ++++-
.../cache/transactions/IgniteTxManager.java | 117 ++++++++--
.../ignite/internal/util/GridJavaProcess.java | 4 +
.../util/spring/IgniteSpringHelper.java | 54 ++++-
.../ignite/internal/visor/cache/VisorCache.java | 92 ++++----
.../visor/node/VisorBasicConfiguration.java | 11 +
.../visor/node/VisorNodeDataCollectorJob.java | 2 +-
.../internal/GridDiscoveryEventSelfTest.java | 30 ++-
.../IgniteCacheEntryListenerAbstractTest.java | 4 +-
.../cache/IgniteCachePutAllRestartTest.java | 203 +++++++++++++++++
.../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 ++-
...xOriginatingNodeFailureAbstractSelfTest.java | 6 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 7 +-
...itionedTxOriginatingNodeFailureSelfTest.java | 2 -
.../near/IgniteCacheNearTxRollbackTest.java | 133 ++++++++++++
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 5 +-
.../IgniteCacheFailoverTestSuite.java | 8 +-
.../testsuites/IgniteCacheRestartTestSuite.java | 3 +-
.../util/spring/IgniteSpringHelperImpl.java | 217 +++++++++++++++----
.../IgniteStartFromStreamConfigurationTest.java | 50 +++++
.../testsuites/IgniteSpringTestSuite.java | 2 +
.../config/VisorConfigurationCommand.scala | 1 +
.../scala/org/apache/ignite/visor/visor.scala | 11 +
pom.xml | 5 +-
40 files changed, 1396 insertions(+), 213 deletions(-)
----------------------------------------------------------------------