You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/27 11:44:52 UTC
[04/50] [abbrv] incubator-ignite git commit: Merge remote-tracking
branch 'remotes/origin/master' into ignite-630
Merge remote-tracking branch 'remotes/origin/master' into ignite-630
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df0c86af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df0c86af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df0c86af
Branch: refs/heads/ignite-961
Commit: df0c86afdd67924d7cb707b0c158b44d1e629159
Parents: df0c9d5 d24c2da
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Mon Jul 20 12:07:18 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Mon Jul 20 12:07:18 2015 +0300
----------------------------------------------------------------------
.../ignite/compute/ComputeJobResultPolicy.java | 3 +-
.../apache/ignite/internal/IgniteKernal.java | 12 ++
.../failover/GridFailoverContextImpl.java | 28 ++-
.../managers/failover/GridFailoverManager.java | 13 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheContext.java | 45 +++--
.../processors/cache/GridCacheMvccManager.java | 6 +-
.../GridCachePartitionExchangeManager.java | 53 ++++++
.../processors/cache/GridCacheUtils.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../distributed/dht/GridDhtTopologyFuture.java | 14 --
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +-
.../GridDhtPartitionsExchangeFuture.java | 31 +---
.../cache/transactions/IgniteTxManager.java | 4 +-
.../processors/closure/AffinityTask.java | 35 ++++
.../closure/GridClosureProcessor.java | 63 ++++++-
.../processors/task/GridTaskWorker.java | 24 ++-
.../ignite/internal/util/IgniteUtils.java | 4 +-
.../plugin/security/SecurityPermission.java | 7 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 14 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 43 +++--
.../ignite/spi/failover/FailoverContext.java | 18 ++
.../spi/failover/always/AlwaysFailoverSpi.java | 25 +++
.../IgniteClientReconnectFailoverTest.java | 47 +++--
.../cache/CacheAffinityCallSelfTest.java | 172 ++++++++++++++++++
.../cache/GridCacheAffinityRoutingSelfTest.java | 157 ++++++++++++++++-
.../cache/IgniteCacheNearLockValueSelfTest.java | 2 +
.../distributed/IgniteCache150ClientsTest.java | 1 +
.../IgniteCacheClientReconnectTest.java | 175 +++++++++++++++++++
.../IgniteCacheServerNodeConcurrentStart.java | 96 ++++++++++
.../IgniteCachePutRetryAbstractSelfTest.java | 52 ++++--
...gniteCachePutRetryTransactionalSelfTest.java | 17 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 140 +++++++++------
.../spi/failover/GridFailoverTestContext.java | 10 ++
.../testframework/junits/GridAbstractTest.java | 5 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../testsuites/IgniteCacheTestSuite2.java | 2 +-
.../testsuites/IgniteCacheTestSuite4.java | 2 -
.../testsuites/IgniteClientNodesTestSuite.java | 42 +++++
.../ignite/schema/ui/SchemaImportApp.java | 36 +++-
42 files changed, 1218 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df0c86af/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df0c86af/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------