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/07/08 15:18:17 UTC
[03/50] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
into ignite-648
Merge branch 'ignite-sprint-7' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23a8296
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23a8296
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23a8296
Branch: refs/heads/ignite-648-failover
Commit: b23a8296f0f721b5a2e2ba4f39081eedddbafa21
Parents: 9edd54e 9f6a7f9
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 3 18:32:31 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 3 18:32:31 2015 +0300
----------------------------------------------------------------------
bin/ignite.bat | 8 +-
bin/ignite.sh | 6 +-
bin/include/parseargs.bat | 1 +
bin/include/parseargs.sh | 3 +
.../java/org/apache/ignite/IgniteCache.java | 5 +
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../processors/cache/CacheOperationContext.java | 44 ++-
.../processors/cache/GridCacheAdapter.java | 91 +++---
.../processors/cache/GridCacheAtomicFuture.java | 12 +-
.../processors/cache/GridCacheMvccManager.java | 8 +-
.../processors/cache/GridCacheProxyImpl.java | 10 +-
.../processors/cache/GridCacheUtils.java | 42 +++
.../processors/cache/IgniteCacheProxy.java | 36 ++-
.../dht/atomic/GridDhtAtomicCache.java | 18 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++--
.../datastructures/GridCacheAtomicLongImpl.java | 25 +-
.../GridCacheAtomicSequenceImpl.java | 11 +-
.../GridCacheAtomicStampedImpl.java | 21 +-
.../GridCacheCountDownLatchImpl.java | 16 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../startup/cmdline/CommandLineStartup.java | 3 +-
.../startup/cmdline/CommandLineTransformer.java | 9 +
.../IgniteCachePutRetryAbstractSelfTest.java | 147 +++++++++
.../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++
...gniteCachePutRetryTransactionalSelfTest.java | 74 +++++
...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +-
.../GridCachePartitionedFailoverSelfTest.java | 5 +
.../IgniteCacheFailoverTestSuite.java | 3 +
.../util/spring/IgniteSpringHelperImpl.java | 72 +++--
.../IgniteExcludeInConfigurationTest.java | 78 +++++
.../org/apache/ignite/spring/sprint-exclude.xml | 57 ++++
.../testsuites/IgniteSpringTestSuite.java | 2 +
.../ignite/visor/commands/VisorConsole.scala | 3 +-
.../visor/commands/open/VisorOpenCommand.scala | 319 +++++++++++++++++++
.../scala/org/apache/ignite/visor/visor.scala | 230 +------------
.../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +
.../commands/kill/VisorKillCommandSpec.scala | 1 +
.../commands/start/VisorStartCommandSpec.scala | 1 +
.../commands/tasks/VisorTasksCommandSpec.scala | 1 +
.../commands/vvm/VisorVvmCommandSpec.scala | 1 +
41 files changed, 1226 insertions(+), 375 deletions(-)
----------------------------------------------------------------------