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 2017/03/14 20:16:39 UTC
geode git commit: GEODE-2641: minor help string changes
Repository: geode
Updated Branches:
refs/heads/develop 057f60be1 -> f9fa3e35b
GEODE-2641: minor help string changes
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f9fa3e35
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f9fa3e35
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f9fa3e35
Branch: refs/heads/develop
Commit: f9fa3e35bb60cb67d1d709d1ee080f61d6e60a1d
Parents: 057f60b
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue Mar 14 09:34:26 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Mar 14 13:16:22 2017 -0700
----------------------------------------------------------------------
.../geode/management/internal/cli/i18n/CliStrings.java | 4 ++--
.../internal/cli/commands/golden-help-offline.properties | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/f9fa3e35/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index b835e8b..5b1f089 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -1391,7 +1391,7 @@ public class CliStrings {
public static final String EXPORT_LOGS__HELP = "Export the log files for a member or members.";
public static final String EXPORT_LOGS__DIR = "dir";
public static final String EXPORT_LOGS__DIR__HELP =
- "Local directory to which log files will be written. This is only used when you are exporting logs using http connection. If not specified, user.dir will be used.";
+ "Local directory to which logs will be written. This is used only when you are exporting logs using an http connection. If not specified, logs are written to the location specified by the user.dir system property.";
public static final String EXPORT_LOGS__MEMBER = "member";
public static final String EXPORT_LOGS__MEMBER__HELP =
"Name/Id of the member whose log files will be exported.";
@@ -1413,7 +1413,7 @@ public class CliStrings {
"Log entries that occurred before this time will be exported. The default is no limit. Format: yyyy/MM/dd/HH/mm/ss/SSS/z OR yyyy/MM/dd";
public static final String EXPORT_LOGS__MERGELOG = "merge-log";
public static final String EXPORT_LOGS__MERGELOG__HELP =
- "Whether to merge logs after exporting to the target directory.";
+ "Whether to merge logs after exporting to the target directory. Deprecated: Since Geode1.2, no longer used.";
public static final String EXPORT_LOGS__MSG__CANNOT_MERGE =
"Could not merge the files in target directory";
public static final String EXPORT_LOGS__MSG__SPECIFY_ONE_OF_OPTION =
http://git-wip-us.apache.org/repos/asf/geode/blob/f9fa3e35/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
index 8cc8aba..3c56def 100644
--- a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
+++ b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
@@ -1473,8 +1473,9 @@ SYNTAX\n\
\ \ \ \ [--end-time=value] [--logs-only(=value)?] [--stats-only(=value)?]\n\
PARAMETERS\n\
\ \ \ \ dir\n\
-\ \ \ \ \ \ \ \ Local directory to which log files will be written. This is only used when you are\n\
-\ \ \ \ \ \ \ \ exporting logs using http connection. If not specified, user.dir will be used.\n\
+\ \ \ \ \ \ \ \ Local directory to which logs will be written. This is used only when you are exporting\n\
+\ \ \ \ \ \ \ \ logs using an http connection. If not specified, logs are written to the location specified\n\
+\ \ \ \ \ \ \ \ by the user.dir system property.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ group\n\
\ \ \ \ \ \ \ \ Group of members whose log files will be exported.\n\
@@ -1492,7 +1493,8 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ \ \ \ \ Default (if the parameter is not specified): false\n\
\ \ \ \ merge-log\n\
-\ \ \ \ \ \ \ \ Whether to merge logs after exporting to the target directory.\n\
+\ \ \ \ \ \ \ \ Whether to merge logs after exporting to the target directory. Deprecated: Since Geode1.2,\n\
+\ \ \ \ \ \ \ \ no longer used.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ \ \ \ \ Default (if the parameter is not specified): false\n\
\ \ \ \ start-time\n\