You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/11 17:13:53 UTC
[24/24] incubator-geode git commit: Merge branch 'develop' into
feature/GEODE-17-2
Merge branch 'develop' into feature/GEODE-17-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7ec4bad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7ec4bad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7ec4bad4
Branch: refs/heads/feature/GEODE-17-2
Commit: 7ec4bad471c942c95cdf3b9e1e462347e20e2791
Parents: a0f6f22 616bc27
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Apr 11 08:12:46 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Apr 11 08:12:46 2016 -0700
----------------------------------------------------------------------
LICENSE | 429 +++--
NOTICE | 20 +-
.../release/conf/cache-client.xml | 6 +-
.../release/conf/cache-peer.xml | 6 +-
.../release/conf/cache-server.xml | 6 +-
geode-assembly/src/main/dist/LICENSE | 894 ++++++++---
geode-assembly/src/main/dist/NOTICE | 658 +++-----
.../internal/SharedConfiguration.java | 4 +-
.../internal/cache/xmlcache/CacheXml.java | 63 +-
.../cache/xmlcache/CacheXmlGenerator.java | 148 +-
.../internal/cache/xmlcache/CacheXmlParser.java | 2 +-
.../cache/xmlcache/CacheXmlVersion.java | 56 +-
.../cache/xmlcache/GeodeEntityResolver.java | 2 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 8 +
.../configuration/domain/CacheElement.java | 4 +-
.../configuration/domain/XmlEntity.java | 7 +-
.../internal/configuration/utils/XmlUtils.java | 6 +-
.../geode.apache.org/schema/cache/cache-1.0.xsd | 1469 +++++++++++++++++
.../gemfire/cache/cache-9.0.xsd | 1519 ------------------
.../gemfire/cache30/CacheXml58DUnitTest.java | 4 +-
.../gemfire/cache30/CacheXml90DUnitTest.java | 234 ---
.../cache30/CacheXmlGeode10DUnitTest.java | 234 +++
.../internal/SharedConfigurationJUnitTest.java | 2 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 2 +
.../xmlcache/AbstractEntityResolverTest.java | 140 ++
.../xmlcache/CacheXmlVersionJUnitTest.java | 30 +-
.../xmlcache/GeodeEntityResolverJUnitTest.java | 49 +
.../PivotalEntityResolverJUnitTest.java | 118 +-
.../domain/CacheElementJUnitTest.java | 4 +-
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 26 +-
.../configuration/utils/XmlUtilsJUnitTest.java | 12 +-
.../codeAnalysis/sanctionedSerializables.txt | 2 +-
.../domain/CacheElementJUnitTest.xml | 6 +-
...dNewNodeJUnitTest.testAddNewNodeNewNamed.xml | 6 +-
...ewNodeJUnitTest.testAddNewNodeNewUnnamed.xml | 6 +-
...itTest.testAddNewNodeNewUnnamedExtension.xml | 6 +-
...NodeJUnitTest.testAddNewNodeReplaceNamed.xml | 6 +-
...deJUnitTest.testAddNewNodeReplaceUnnamed.xml | 6 +-
...st.testAddNewNodeReplaceUnnamedExtension.xml | 6 +-
...ddNewNodeJUnitTest.testDeleteNodeUnnamed.xml | 6 +-
.../utils/XmlUtilsAddNewNodeJUnitTest.xml | 6 +-
...Test.testBuildSchemaLocationMapAttribute.xml | 6 +-
...testBuildSchemaLocationMapEmptyAttribute.xml | 4 +-
...ationMapMapOfStringListOfStringAttribute.xml | 6 +-
....testBuildSchemaLocationMapNullAttribute.xml | 4 +-
...XmlUtilsJUnitTest.testQuerySingleElement.xml | 6 +-
.../internal/cache/PutAllCSDUnitTest.java | 325 ++--
.../geode.apache.org/lucene/lucene-1.0.xsd | 12 +-
...erIntegrationJUnitTest.createIndex.cache.xml | 8 +-
...serIntegrationJUnitTest.parseIndex.cache.xml | 8 +-
.../src/main/webapp/META-INF/MANIFEST.MF | 3 -
geode-pulse/src/main/webapp/META-INF/NOTICE | 90 ++
.../util/AutoBalancerIntegrationJUnitTest.java | 12 +-
.../website/content/schema/cache/cache-1.0.xsd | 1469 +++++++++++++++++
geode-site/website/layouts/footer.html | 12 -
geode-site/website/layouts/header.html | 12 +
.../gemfire/internal/cache/wan/WANTestBase.java | 6 +-
.../web/swagger/config/SwaggerConfig.java | 13 +-
geode-web-api/src/main/webapp/META-INF/NOTICE | 89 +
geode-web/src/main/webapp/META-INF/NOTICE | 36 +
gradle/dependency-resolution.gradle | 1 +
gradle/java.gradle | 5 +-
62 files changed, 5253 insertions(+), 3092 deletions(-)
----------------------------------------------------------------------