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/06/27 21:21:03 UTC
[13/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-1571
Merge branch 'develop' into feature/GEODE-1571
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a4c2dada
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a4c2dada
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a4c2dada
Branch: refs/heads/feature/GEODE-1571
Commit: a4c2dada36a07f29d3acbece4c149e7e96867562
Parents: e9d9144 5882693
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Jun 22 11:06:43 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Jun 22 11:06:43 2016 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/Statistics.java | 32 +--
.../gemfire/internal/StatSamplerStats.java | 2 +-
.../management/internal/cli/GfshParser.java | 4 +-
.../cli/functions/DataCommandFunction.java | 9 +-
.../cli/functions/RegionCreateFunction.java | 5 +-
.../cli/parser/jopt/JoptOptionParser.java | 4 +-
.../internal/cli/remote/CommandProcessor.java | 1 -
.../internal/cli/util/HyphenFormatter.java | 92 +++++++++
.../internal/cli/util/OptionJFormatter.java | 115 -----------
.../internal/cli/GfshParserIntegrationTest.java | 38 ++++
.../commands/GemfireDataCommandsDUnitTest.java | 106 +++++++---
.../internal/cli/util/HyphenFormatterTest.java | 201 +++++++++++++++++++
.../internal/cli/util/OptionJFormatterTest.java | 189 -----------------
.../gemfire/cache/lucene/LuceneQueriesBase.java | 36 +++-
.../lucene/LuceneQueriesClientDUnitTest.java | 70 +++++++
.../src/main/resources/gemfire.properties | 2 +-
geode-pulse/src/main/webapp/DataBrowser.html | 2 +-
geode-pulse/src/main/webapp/MemberDetails.html | 2 +-
.../src/main/webapp/QueryStatistics.html | 2 +-
geode-pulse/src/main/webapp/clusterDetail.html | 2 +-
.../main/webapp/properties/gemfire.properties | 2 +-
.../webapp/properties/gemfire_en.properties | 2 +-
geode-pulse/src/main/webapp/regionDetail.html | 2 +-
.../cli/commands/CommandOverHttpDUnitTest.java | 2 +-
24 files changed, 541 insertions(+), 381 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a4c2dada/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java
----------------------------------------------------------------------