Merge remote-tracking branch 'origin/sprint-1' into sprint-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/93c36db6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/93c36db6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/93c36db6 Branch: refs/heads/ignite-132 Commit: 93c36db6f2367f967ffefa870f161492c5bc7c90 Parents: 6730377 97ad267 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Jan 28 14:37:32 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Jan 28 14:37:32 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/gridify/AbstractAopTest.java | 2 +- .../apache/ignite/gridify/TestGridifyTask.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 38 ++- .../java/org/apache/ignite/cache/CacheLock.java | 57 ----- .../ignite/internal/IgniteClusterAsyncImpl.java | 9 +- .../ignite/internal/IgniteComputeImpl.java | 70 +++--- .../ignite/internal/IgniteEventsImpl.java | 9 +- .../ignite/internal/IgniteMessagingImpl.java | 12 +- .../processors/cache/CacheLockImpl.java | 132 ++++++++--- .../processors/cache/IgniteCacheProxy.java | 33 +-- .../processors/fs/GridGgfsAsyncImpl.java | 7 +- .../apache/ignite/internal/util/GridUtils.java | 12 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 35 ++- .../GridDeploymentMessageCountSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 84 +++---- .../cache/GridCacheBasicApiAbstractTest.java | 229 +++++++++++-------- .../GridCacheFinishPartitionsSelfTest.java | 25 +- .../GridCacheGroupLockAbstractSelfTest.java | 13 +- .../cache/GridCacheNestedTxAbstractTest.java | 13 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 11 +- .../distributed/GridCacheLockAbstractTest.java | 62 +++-- .../GridCacheMultiNodeLockAbstractTest.java | 139 ++++++----- .../dht/GridCacheColocatedDebugTest.java | 43 ++-- .../near/GridCacheNearMultiNodeSelfTest.java | 25 +- .../near/GridCacheNearOneNodeSelfTest.java | 42 ++-- .../near/GridCacheNearReadersSelfTest.java | 13 +- .../near/GridCachePartitionedBasicApiTest.java | 4 +- .../GridCacheReplicatedBasicApiTest.java | 4 +- .../GridCacheEvictionLockUnlockSelfTest.java | 7 +- .../local/GridCacheLocalBasicApiSelfTest.java | 4 +- .../cache/local/GridCacheLocalLockSelfTest.java | 81 ++++--- .../GridCacheLocalMultithreadedSelfTest.java | 85 ++++--- .../continuous/GridMessageListenSelfTest.java | 4 +- .../streamer/GridStreamerSelfTest.java | 2 +- .../ignite/messaging/GridMessagingSelfTest.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 4 +- .../p2p/GridP2PLocalDeploymentSelfTest.java | 10 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 8 +- .../ignite/p2p/GridP2PTimeoutSelfTest.java | 8 +- .../ignite/p2p/GridP2PUndeploySelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 21 +- 41 files changed, 739 insertions(+), 628 deletions(-) ----------------------------------------------------------------------
