ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-42
Date Thu, 22 Jan 2015 15:02:32 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-36 bc9ed7982 -> e4c53f885


# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-42


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

Branch: refs/heads/ignite-36
Commit: 43e060847af9ec78c848ffe30c4a73ccf583e678
Parents: 5521dac 6dd8b40
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jan 19 09:47:05 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jan 19 09:47:05 2015 +0300

----------------------------------------------------------------------
 LICENSE.txt                                     | 202 ++++++++++++++
 apache-2.0.txt                                  | 202 --------------
 .../java/org/apache/ignite/IgniteCache.java     |   4 +-
 .../processors/cache/IgniteCacheProxy.java      |  76 +++++-
 .../processors/cache/CacheInvokeEntry.java      |  14 +
 .../processors/cache/GridCacheMapEntry.java     |  17 +-
 .../cache/transactions/IgniteTxAdapter.java     |  22 +-
 .../grid/kernal/visor/query/VisorQueryTask.java |  53 ++--
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |  18 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java | 271 ++++---------------
 .../cache/GridCacheBasicApiAbstractTest.java    |  91 ++++---
 .../GridCacheFinishPartitionsSelfTest.java      |  21 +-
 .../GridCacheGroupLockAbstractSelfTest.java     |  23 +-
 .../cache/GridCacheNestedTxAbstractTest.java    |  28 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |  38 +--
 .../distributed/GridCacheLockAbstractTest.java  |  40 +--
 .../GridCacheMultiNodeLockAbstractTest.java     | 144 +++++++---
 .../dht/GridCacheColocatedDebugTest.java        |  26 +-
 ...dCachePartitionedTopologyChangeSelfTest.java |   8 +-
 .../near/GridCacheNearMultiNodeSelfTest.java    |  16 +-
 .../near/GridCacheNearOneNodeSelfTest.java      |  39 +--
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  42 ---
 .../near/GridCacheNearReadersSelfTest.java      |  14 +-
 ...titionedExplicitLockNodeFailureSelfTest.java |   1 +
 .../near/GridCachePartitionedLockSelfTest.java  |  11 +-
 .../GridCacheEvictionLockUnlockSelfTest.java    |   7 +-
 .../cache/local/GridCacheLocalLockSelfTest.java |  36 +--
 .../GridCacheLocalMultithreadedSelfTest.java    |  42 +--
 .../ggfs/GridGgfsMetaManagerSelfTest.java       |   6 +-
 .../java/org/gridgain/grid/p2p/p2p.properties   |  17 --
 30 files changed, 746 insertions(+), 783 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index fddb99a,2fb802b..309eecd
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@@ -17,8 -17,8 +17,9 @@@
  
  package org.gridgain.grid.kernal.processors.cache;
  
+ import com.google.common.collect.*;
  import org.apache.ignite.*;
 +import org.apache.ignite.cache.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
index fa3f01f,b3796be..b33ec9e
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java
@@@ -17,7 -17,7 +17,8 @@@
  
  package org.gridgain.grid.kernal.processors.cache;
  
 +import org.apache.ignite.cache.*;
+ import org.apache.ignite.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.transactions.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index 375f584,0e583e5..5626267
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@@ -24,11 -23,13 +24,12 @@@ import org.apache.ignite.spi.discovery.
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
  import org.apache.ignite.transactions.*;
  import org.gridgain.grid.cache.*;
 -import org.gridgain.grid.cache.store.*;
  import org.gridgain.grid.kernal.processors.cache.*;
  import org.gridgain.testframework.junits.common.*;
 -import org.jetbrains.annotations.*;
  
 +import javax.cache.*;
  import java.util.concurrent.*;
+ import java.util.concurrent.locks.*;
  
  import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
  import static org.gridgain.grid.cache.GridCacheDistributionMode.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
index 91c5e12,94a13b0..8014d4d
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java
@@@ -17,7 -17,7 +17,8 @@@
  
  package org.gridgain.grid.kernal.processors.cache.distributed.near;
  
 +import org.apache.ignite.cache.*;
+ import org.apache.ignite.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
index 6bb085c,88d4f87..54d29a9
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java
@@@ -17,7 -17,7 +17,8 @@@
  
  package org.gridgain.grid.kernal.processors.cache.eviction;
  
 +import org.apache.ignite.cache.*;
+ import org.apache.ignite.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
  import org.apache.ignite.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLockSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43e06084/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java
----------------------------------------------------------------------


Mime
View raw message