ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [49/50] incubator-ignite git commit: Merge branch 'ignite-286' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-286
Date Thu, 23 Apr 2015 22:56:55 GMT
Merge branch 'ignite-286' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-286


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

Branch: refs/heads/ignite-286
Commit: 24b3c47863df57d7364d25aa31a30ef59a4ac65c
Parents: 4b133bd 8a0e27c
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Apr 23 23:53:29 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Apr 23 23:53:29 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheSwapManager.java  |  34 +++++
 .../processors/cache/local/GridLocalCache.java  |  11 +-
 .../local/atomic/GridLocalAtomicCache.java      |  11 +-
 .../cache/query/GridCacheQueryManager.java      |  24 ++-
 .../transactions/IgniteTxLocalAdapter.java      |   2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 153 +++++++++++--------
 .../cache/GridCacheAbstractSelfTest.java        |   8 +-
 ...achePartitionedMultiNodeFullApiSelfTest.java |   8 +-
 ...edOffHeapTieredMultiNodeFullApiSelfTest.java |  13 +-
 .../IgniteCacheFullApiSelfTestSuite.java        |  12 +-
 10 files changed, 189 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24b3c478/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b9620bb,36043d8..c497aaf
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@@ -47,9 -48,9 +48,10 @@@ import java.util.concurrent.atomic.*
  import java.util.concurrent.locks.*;
  
  import static java.util.concurrent.TimeUnit.*;
 +import static org.apache.ignite.cache.CacheAtomicityMode.*;
  import static org.apache.ignite.cache.CacheMemoryMode.*;
  import static org.apache.ignite.cache.CacheMode.*;
+ import static org.apache.ignite.cache.CachePeekMode.*;
  import static org.apache.ignite.events.EventType.*;
  import static org.apache.ignite.testframework.GridTestUtils.*;
  import static org.apache.ignite.transactions.TransactionConcurrency.*;


Mime
View raw message