Merge remote-tracking branch 'remotes/origin/ignite-668' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cad2ab38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cad2ab38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cad2ab38 Branch: refs/heads/ignite-639 Commit: cad2ab38051171499023a8f716f670a6f2144bf3 Parents: 5b806d8 223a9cd Author: sboikov <sboi...@gridgain.com> Authored: Mon Apr 6 09:11:26 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Apr 6 09:11:26 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 47 +++--- .../cache/IgniteInternalCacheTypesTest.java | 159 +++++++++++++++++++ .../IgniteCacheSystemTransactionsSelfTest.java | 3 +- .../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 + 23 files changed, 592 insertions(+), 216 deletions(-) ----------------------------------------------------------------------
