Merge remote-tracking branch 'origin/ignite-1' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6dd8b40f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6dd8b40f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6dd8b40f Branch: refs/heads/ignite-54 Commit: 6dd8b40f36411c41870adb20e6d6f6c26d4f7c33 Parents: 062b899 80b986f Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Fri Jan 16 12:03:21 2015 -0800 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Fri Jan 16 12:03:21 2015 -0800 ---------------------------------------------------------------------- .../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 | 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, 546 insertions(+), 581 deletions(-) ----------------------------------------------------------------------
