Merge branches 'ignite-593' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0d6e892 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0d6e892 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0d6e892 Branch: refs/heads/ignite-639 Commit: c0d6e8928e8bd66207ad70b79d72b10a06bbd921 Parents: b6c605c aae951e Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Apr 6 19:01:15 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Apr 6 19:01:15 2015 +0700 ---------------------------------------------------------------------- assembly/release-fabric.xml | 5 - modules/clients/readme.md | 2 - .../apache/ignite/internal/IgniteKernal.java | 2 +- .../processors/cache/CacheDistributionMode.java | 67 -------- .../internal/processors/cache/CacheType.java | 77 +++++++++ .../cache/DynamicCacheChangeRequest.java | 17 ++ .../cache/DynamicCacheDescriptor.java | 15 +- .../processors/cache/GridCacheAdapter.java | 6 +- .../processors/cache/GridCacheContext.java | 26 ++- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheProcessor.java | 133 +++++++++++----- .../cache/GridCacheSharedContext.java | 4 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../near/GridNearTransactionalCache.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 19 ++- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 8 +- .../processors/task/GridTaskProcessor.java | 24 ++- .../internal/visor/util/VisorTaskUtils.java | 18 ++- .../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--- .../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++ .../IgniteCollectionAbstractTest.java | 23 --- .../IgniteCacheSystemTransactionsSelfTest.java | 3 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../near/GridCacheNearEvictionSelfTest.java | 2 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 8 +- ...NearDisabledBasicStoreMultiNodeSelfTest.java | 8 +- .../processors/igfs/IgfsStartCacheTest.java | 158 ++++++++++++++++++ .../processors/igfs/IgsfStartCacheTest.java | 115 -------------- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +- ...niteCacheAtomicNearEnabledQuerySelfTest.java | 7 +- .../near/IgniteCacheAtomicQuerySelfTest.java | 7 +- modules/yardstick/README.md | 3 +- .../yardstick/IgniteAbstractBenchmark.java | 5 +- .../yardstick/IgniteBenchmarkArguments.java | 22 ++- .../org/apache/ignite/yardstick/IgniteNode.java | 11 +- parent/pom.xml | 49 +++--- pom.xml | 92 ++++++++++- 43 files changed, 781 insertions(+), 390 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0d6e892/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ----------------------------------------------------------------------
