Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-238
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e9ba67ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9ba67ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9ba67ff Branch: refs/heads/ignite-238 Commit: e9ba67ff519470d3c56d3307588339039fa97576 Parents: 7dd9d4b 322408f Author: sboikov <sboi...@gridgain.com> Authored: Fri Feb 13 09:10:49 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Feb 13 09:10:49 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheManager.java | 32 +++-- .../configuration/IgniteConfiguration.java | 26 +++++ .../org/apache/ignite/events/EventType.java | 45 +------ .../org/apache/ignite/events/LicenseEvent.java | 116 ------------------- .../org/apache/ignite/internal/IgnitionEx.java | 1 + .../GridDeploymentPerVersionStore.java | 4 +- .../cache/CacheVersionedEntryImpl.java | 9 -- .../cache/GridCacheDeploymentManager.java | 14 ++- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 12 +- .../dht/preloader/GridDhtPartitionMap.java | 32 ++++- .../preloader/GridDhtPartitionsFullMessage.java | 47 +------- .../dht/preloader/GridDhtPreloader.java | 18 ++- .../visor/event/VisorGridLicenseEvent.java | 74 ------------ .../node/VisorNodeEventsCollectorTask.java | 5 - .../internal/visor/util/VisorTaskUtils.java | 9 -- .../optimized/optimized-classnames.properties | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 31 +++++ .../cache/GridCacheConcurrentMapSelfTest.java | 4 +- .../cache/GridCacheOffHeapSelfTest.java | 46 ++++---- ...IgniteCacheAbstractExecutionContextTest.java | 96 +++++++++++++++ .../IgniteCacheAtomicExecutionContextTest.java | 49 ++++++++ ...iteCachePartitionedExecutionContextTest.java | 49 ++++++++ ...niteCacheReplicatedExecutionContextTest.java | 49 ++++++++ .../IgniteCacheTxExecutionContextTest.java | 49 ++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 8 ++ .../testsuites/IgniteLangSelfTestSuite.java | 1 - .../tests/p2p/CacheDeploymentTestValue.java | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 23 ++-- .../processors/cache/GridCacheSwapSelfTest.java | 40 +++---- .../near/GridCachePartitionedQuerySelfTest.java | 33 +++--- .../query/h2/GridH2IndexRebuildTest.java | 10 +- .../scala/org/apache/ignite/visor/visor.scala | 4 - pom.xml | 21 +--- 34 files changed, 517 insertions(+), 446 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e9ba67ff/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------
