Merge remote-tracking branch 'remotes/origin/ignite-gg-8.0.2.ea2' into ignite-gg-11810
# Conflicts: # modules/pds/src/main/java/org/gridgain/grid/cache/db/GridCacheOffheapManager.java # modules/pds/src/main/java/org/gridgain/grid/internal/processors/cache/database/GridCacheDatabaseSharedManager.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b56558c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b56558c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b56558c Branch: refs/heads/ignite-gg-11810 Commit: 1b56558cae1c75ffb0e011a82916cd10a5829c3b Parents: 9876950 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 29 14:40:09 2016 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 29 14:40:09 2016 +0300 ---------------------------------------------------------------------- modules/yardstick/config/ignite-base-config.xml | 13 ------------- 1 file changed, 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1b56558c/modules/yardstick/config/ignite-base-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index 047738d..8ce3c98 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -125,19 +125,6 @@ <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="ATOMIC"/> - - <property name="typeMetadata"> - <list> - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Person1</value> - - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Person2</value> - - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Person8</value> - </list> - </property> </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration">