Repository: accumulo Updated Branches: refs/heads/master ab0d6fc3f -> b5d7c1807
ACCUMULO-4490 formatter cleanup and typo fix Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b5d7c180 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b5d7c180 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b5d7c180 Branch: refs/heads/master Commit: b5d7c180771ffcbf699ec0b6b64bf53a55ef914a Parents: ab0d6fc Author: Michael Wall <mjw...@gmail.com> Authored: Thu Nov 10 14:52:07 2016 -0500 Committer: Michael Wall <mjw...@gmail.com> Committed: Thu Nov 10 15:18:09 2016 -0500 ---------------------------------------------------------------------- assemble/bin/accumulo | 2 +- core/src/main/java/org/apache/accumulo/core/Constants.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b5d7c180/assemble/bin/accumulo ---------------------------------------------------------------------- diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo index 210350d..f725952 100755 --- a/assemble/bin/accumulo +++ b/assemble/bin/accumulo @@ -522,7 +522,7 @@ function main() { exit 1 fi - if [[ ! "$1" =~ ^(gc|master|monitor|tserver|traser)$ ]]; then + if [[ ! "$1" =~ ^(gc|master|monitor|tserver|tracer)$ ]]; then if [[ -f ${ACCUMULO_CONF_DIR}/log4j.properties ]]; then export ACCUMULO_OPTS="${ACCUMULO_OPTS} -Dlog4j.configuration=file:${ACCUMULO_CONF_DIR}/log4j.properties" else http://git-wip-us.apache.org/repos/asf/accumulo/blob/b5d7c180/core/src/main/java/org/apache/accumulo/core/Constants.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java index 85a7238..eebd81d 100644 --- a/core/src/main/java/org/apache/accumulo/core/Constants.java +++ b/core/src/main/java/org/apache/accumulo/core/Constants.java @@ -126,8 +126,7 @@ public class Constants { public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt"; // Variables that will be substituted with environment vars in PropertyType.PATH values - public static final Collection<String> PATH_PROPERTY_ENV_VARS = Collections.unmodifiableCollection(Arrays.asList("ACCUMULO_HOME", - "ACCUMULO_CONF_DIR")); + public static final Collection<String> PATH_PROPERTY_ENV_VARS = Collections.unmodifiableCollection(Arrays.asList("ACCUMULO_HOME", "ACCUMULO_CONF_DIR")); public static final String HDFS_TABLES_DIR = "/tables";
