[GitHub] mikewalch closed pull request #750: Updated accumulo-env.sh to include existing CLASSPATH

[GitBox <gi...@apache.org>]

mikewalch closed pull request #750: Updated accumulo-env.sh to include existing CLASSPATH
URL: https://github.com/apache/accumulo/pull/750
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemble/conf/accumulo-env.sh b/assemble/conf/accumulo-env.sh
index 8a2c851ce4..d1ef0b9e9c 100644
--- a/assemble/conf/accumulo-env.sh
+++ b/assemble/conf/accumulo-env.sh
@@ -50,8 +50,8 @@ if [ ! -d "$HADOOP_HOME" ]; then
   exit 1
 fi
 
-## Add external Hadoop & Zookeeper dependencies to CLASSPATH.
-CLASSPATH="${conf}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*:${HADOOP_HOME}/share/hadoop/client/*"
+## Build using existing CLASSPATH, conf/ directory, dependencies in lib/, and external Hadoop & Zookeeper dependencies
+CLASSPATH="${CLASSPATH}:${conf}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*:${HADOOP_HOME}/share/hadoop/client/*"
 export CLASSPATH
 
 ##################################################################


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services