Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a2eb5a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a2eb5a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a2eb5a3 Branch: refs/heads/ignite-99 Commit: 2a2eb5a3f2c162378067d398391413abcaf87ac1 Parents: 09df7de 6dd8b40 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 19 10:41:09 2015 +0400 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 19 10:41:09 2015 +0400 ---------------------------------------------------------------------- LICENSE.txt | 202 ++++++++++++++ apache-2.0.txt | 202 -------------- .../java/org/apache/ignite/IgniteCache.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 76 +++++- .../processors/cache/GridCacheMapEntry.java | 2 +- .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++-- .../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 271 ++++--------------- .../cache/GridCacheBasicApiAbstractTest.java | 91 ++++--- .../GridCacheFinishPartitionsSelfTest.java | 22 +- .../GridCacheGroupLockAbstractSelfTest.java | 24 +- .../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 -- 28 files changed, 699 insertions(+), 781 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a2eb5a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a2eb5a3/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------
