accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [37/39] git commit: ACCUMULO-645 found another HADOOP_HOME reference
Date Tue, 26 Nov 2013 15:48:26 GMT
ACCUMULO-645 found another HADOOP_HOME reference

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433102 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 16c9a002e2d2c1556d8f836217042ebcf008da5a)

Reason: Hadoop2 Compat
Author: Eric C. Newton <ecn@apache.org>
Ref: ACCUMULO-1792

Signed-off-by: Eric Newton <eric.newton@gmail.com>


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3a3509604a71a549c4b1f07d1411b3e25bf3f7bf
Parents: 5dd9016
Author: Eric C. Newton <ecn@apache.org>
Authored: Mon Jan 14 20:26:20 2013 +0000
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Mon Nov 25 16:06:44 2013 -0500

----------------------------------------------------------------------
 conf/examples/1GB/native-standalone/accumulo-site.xml   | 6 +++---
 conf/examples/1GB/standalone/accumulo-site.xml          | 6 +++---
 conf/examples/2GB/native-standalone/accumulo-site.xml   | 6 +++---
 conf/examples/2GB/standalone/accumulo-site.xml          | 6 +++---
 conf/examples/3GB/native-standalone/accumulo-site.xml   | 6 +++---
 conf/examples/3GB/standalone/accumulo-site.xml          | 6 +++---
 conf/examples/512MB/native-standalone/accumulo-site.xml | 6 +++---
 conf/examples/512MB/standalone/accumulo-site.xml        | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml
index 3f4705d..97f70d5 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -102,9 +102,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml
index 5c45e21..f857fd0 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -97,9 +97,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml
index f39b367..3988e66 100644
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@ -92,9 +92,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/standalone/accumulo-site.xml b/conf/examples/2GB/standalone/accumulo-site.xml
index 653860b..9f5d7fd 100644
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@ -92,9 +92,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml
index 368cbfe..4509c96 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -87,9 +87,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml
index 368cbfe..4509c96 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -87,9 +87,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml
index 58ab600..7d22ab2 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -97,9 +97,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml
index 0044c8e..34868b5 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -97,9 +97,9 @@
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,
 	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/lib/[^.].*.jar,
+	$HADOOP_CONF_DIR,
+	$HADOOP_PREFIX/[^.].*.jar,
+	$HADOOP_PREFIX/lib/[^.].*.jar,
       </value>
       <description>Classpaths that accumulo checks for updates and class files.
       When using the Security Manager, please remove the ".../target/classes/" values.


Mime
View raw message