You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/12/12 21:08:37 UTC

[1/2] git commit: ACCUMULO-1960 ACCUMULO-1794 Add in a default for HADOOP_PREFIX in continuous-env.sh.example

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT b33b5a15a -> c04c9de7f


ACCUMULO-1960 ACCUMULO-1794 Add in a default for HADOOP_PREFIX in continuous-env.sh.example


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c2cd0518a5c2489f568814206c0681ef330df7c7
Parents: 7b1f303
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 12 15:07:15 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 12 15:07:15 2013 -0500

----------------------------------------------------------------------
 test/system/continuous/continuous-env.sh.example | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2cd0518/test/system/continuous/continuous-env.sh.example
----------------------------------------------------------------------
diff --git a/test/system/continuous/continuous-env.sh.example b/test/system/continuous/continuous-env.sh.example
index 081ff48..59464f5 100644
--- a/test/system/continuous/continuous-env.sh.example
+++ b/test/system/continuous/continuous-env.sh.example
@@ -16,6 +16,7 @@
 # set this to an absolute path that exist on every machine
 # Inherit values from environment if they are already set.
 HADOOP_HOME=${HADOOP_HOME:-/opt/hadoop}
+HADOOP_PREFIX=${HADOOP_PREFIX:-$HADOOP_HOME}
 ACCUMULO_HOME=${ACCUMULO_HOME:-/opt/accumulo}
 ACCUMULO_CONF_DIR=${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}
 JAVA_HOME=${JAVA_HOME:-/opt/java}


[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c04c9de7fb6746f47c8b1e99f1dd5ae2dd6d2c6d
Parents: b33b5a1 c2cd051
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 12 15:08:29 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 12 15:08:29 2013 -0500

----------------------------------------------------------------------
 test/system/continuous/continuous-env.sh.example | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------