accumulo git commit: ACCUMULO-4409 Fix typo from merge conflict

[ct...@apache.org]

Repository: accumulo
Updated Branches:
  refs/heads/master 5a18575d2 -> abf78169d


ACCUMULO-4409 Fix typo from merge conflict


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/abf78169
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/abf78169
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/abf78169

Branch: refs/heads/master
Commit: abf78169d8bec0539f95d367476f09df828eae6d
Parents: 5a18575
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Mar 9 20:23:28 2017 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Mar 9 20:23:28 2017 -0500

----------------------------------------------------------------------
 assemble/conf/templates/accumulo-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/abf78169/assemble/conf/templates/accumulo-env.sh
----------------------------------------------------------------------
diff --git a/assemble/conf/templates/accumulo-env.sh b/assemble/conf/templates/accumulo-env.sh
index 5e3864b..2985402 100644
--- a/assemble/conf/templates/accumulo-env.sh
+++ b/assemble/conf/templates/accumulo-env.sh
@@ -66,7 +66,7 @@ esac
 ## JVM options set for logging. Review logj4 properties files to see how they are used.
 JAVA_OPTS=("${JAVA_OPTS[@]}"
   "-Daccumulo.log.dir=${ACCUMULO_LOG_DIR}"
-  "-Daccumulo.application=${ACCUMULO_CMD}${ACCUMULO_SERVICE_INSTANCE}_$(hostname)")
+  "-Daccumulo.application=${cmd}${ACCUMULO_SERVICE_INSTANCE}_$(hostname)")
 
 case "$cmd" in
   monitor)