ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [24/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Date Fri, 10 Apr 2015 13:07:03 GMT
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3

Conflicts:
	modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0c5813d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0c5813d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0c5813d

Branch: refs/heads/ignite-gg-9998
Commit: a0c5813d78a80f6c1cf0fc0e710b22398819289d
Parents: e4cf6c5 2bc1c17
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Fri Apr 10 12:00:45 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Fri Apr 10 12:00:45 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   4 +-
 .../ignite/codegen/MessageCodeGenerator.java    |   1 -
 .../java/org/apache/ignite/IgniteCache.java     |  15 +-
 .../configuration/IgniteConfiguration.java      |  19 --
 .../discovery/GridDiscoveryManager.java         |   3 +-
 .../processors/cache/GridCacheAdapter.java      |  25 ++-
 .../processors/cache/GridCacheContext.java      |  58 ++++-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../cache/GridCacheExplicitLockSpan.java        |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   6 +-
 .../processors/cache/GridCacheMvcc.java         |   2 +-
 .../cache/GridCacheMvccCandidate.java           |  50 ++++-
 .../processors/cache/GridCacheMvccManager.java  |  44 +++-
 .../processors/cache/GridCacheProcessor.java    |  52 ++---
 .../distributed/GridDistributedCacheEntry.java  |  12 +-
 .../distributed/dht/GridDhtCacheEntry.java      |  36 ++-
 .../distributed/dht/GridDhtLockFuture.java      |  18 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |  14 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |  22 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   2 +
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  30 ++-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  28 ++-
 .../dht/colocated/GridDhtColocatedCache.java    |  32 ++-
 .../colocated/GridDhtColocatedLockFuture.java   |  46 +++-
 .../GridDhtPartitionsExchangeFuture.java        |  39 +++-
 .../distributed/near/GridNearCacheEntry.java    |  10 +-
 .../distributed/near/GridNearLockFuture.java    |  13 +-
 .../near/GridNearTxFinishFuture.java            |   8 +-
 .../cache/distributed/near/GridNearTxLocal.java |   7 +
 .../near/GridNearTxPrepareFuture.java           | 122 +++++++----
 .../near/GridNearTxPrepareRequest.java          |  64 ++++--
 .../cache/transactions/IgniteTxAdapter.java     |   3 +-
 .../cache/transactions/IgniteTxHandler.java     | 120 +++++++---
 .../transactions/IgniteTxLocalAdapter.java      |  76 ++++---
 .../cache/transactions/IgniteTxManager.java     |   7 +
 .../internal/util/future/GridFutureAdapter.java |  20 +-
 .../ignite/internal/util/worker/GridWorker.java |   6 +-
 .../discovery/tcp/TcpClientDiscoverySpi.java    |   6 +-
 .../GridCacheAffinityBackupsSelfTest.java       |  15 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  13 +-
 .../GridCacheAbstractIteratorsSelfTest.java     |   3 +-
 .../cache/GridCacheAbstractSelfTest.java        |  10 +-
 .../cache/GridCacheBasicApiAbstractTest.java    |   4 +-
 .../cache/GridCacheClearAllSelfTest.java        |   2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   9 +-
 .../GridCachePreloadingEvictionsSelfTest.java   |  23 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |   5 +-
 .../cache/IgniteCachePeekModesAbstractTest.java |  40 ++--
 .../GridCacheMultiNodeAbstractTest.java         |  13 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |  12 +-
 .../dht/GridCacheDhtPreloadUnloadSelfTest.java  |   2 +-
 .../dht/IgniteCacheLockFailoverSelfTest.java    | 156 +++++++++++++
 .../dht/IgniteCacheMultiTxLockSelfTest.java     | 219 +++++++++++++++++++
 .../near/GridCacheNearMultiNodeSelfTest.java    |  26 +--
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |   2 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   6 +-
 .../near/IgniteCacheNearReadCommittedTest.java  |   4 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   5 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  23 +-
 .../testframework/junits/GridAbstractTest.java  |   4 +-
 .../junits/common/GridCommonAbstractTest.java   |  13 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   3 +
 .../IgniteSpiDiscoverySelfTestSuite.java        |   2 +
 ...CacheOffheapTieredMultithreadedSelfTest.java |   4 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |   2 +-
 .../cache/IgniteCacheQueryIndexSelfTest.java    |   3 +-
 .../IgniteCachePartitionedQuerySelfTest.java    |   5 +-
 .../IgniteCacheReplicatedQuerySelfTest.java     |   7 +-
 .../cache/ttl/CacheTtlAbstractSelfTest.java     |  14 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   1 +
 70 files changed, 1264 insertions(+), 414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0c5813d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0c5813d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------


Mime
View raw message