Updated Branches: refs/heads/1.6.0-SNAPSHOT a871d59b8 -> c44fa4f37 refs/heads/master a88df142f -> 1bfa738a7
ACCUMULO-2126 Pre-emptively update the comments in the example configs Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c44fa4f3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c44fa4f3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c44fa4f3 Branch: refs/heads/1.6.0-SNAPSHOT Commit: c44fa4f37493c57c9c4b71f952f9f1024e5e54fe Parents: a871d59 Author: Josh Elser <els...@apache.org> Authored: Fri Jan 3 18:35:45 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Jan 3 18:35:45 2014 -0500 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/1GB/standalone/accumulo-site.xml | 2 +- conf/examples/2GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/2GB/standalone/accumulo-site.xml | 2 +- conf/examples/3GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/3GB/standalone/accumulo-site.xml | 2 +- conf/examples/512MB/native-standalone/accumulo-site.xml | 2 +- conf/examples/512MB/standalone/accumulo-site.xml | 2 +- conf/examples/crypto/accumulo-site.xml | 2 +- conf/examples/vfs-classloader/accumulo-site.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 32c6774..b68059c 100644 --- a/conf/examples/1GB/native-standalone/accumulo-site.xml +++ b/conf/examples/1GB/native-standalone/accumulo-site.xml @@ -105,7 +105,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 1906a56..1bca857 100644 --- a/conf/examples/1GB/standalone/accumulo-site.xml +++ b/conf/examples/1GB/standalone/accumulo-site.xml @@ -105,7 +105,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 042746b..9eaa5ff 100644 --- a/conf/examples/2GB/native-standalone/accumulo-site.xml +++ b/conf/examples/2GB/native-standalone/accumulo-site.xml @@ -95,7 +95,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 96e7671..c9e0309 100644 --- a/conf/examples/2GB/standalone/accumulo-site.xml +++ b/conf/examples/2GB/standalone/accumulo-site.xml @@ -108,7 +108,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 f600505..9b82ed3 100644 --- a/conf/examples/3GB/native-standalone/accumulo-site.xml +++ b/conf/examples/3GB/native-standalone/accumulo-site.xml @@ -90,7 +90,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 e305730..a127cbd 100644 --- a/conf/examples/3GB/standalone/accumulo-site.xml +++ b/conf/examples/3GB/standalone/accumulo-site.xml @@ -95,7 +95,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 69cb174..0e8bdb2 100644 --- a/conf/examples/512MB/native-standalone/accumulo-site.xml +++ b/conf/examples/512MB/native-standalone/accumulo-site.xml @@ -100,7 +100,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/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 3edb88f..1a30ce7 100644 --- a/conf/examples/512MB/standalone/accumulo-site.xml +++ b/conf/examples/512MB/standalone/accumulo-site.xml @@ -106,7 +106,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/conf/examples/crypto/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/crypto/accumulo-site.xml b/conf/examples/crypto/accumulo-site.xml index 5c17fe4..05181e8 100644 --- a/conf/examples/crypto/accumulo-site.xml +++ b/conf/examples/crypto/accumulo-site.xml @@ -102,7 +102,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/c44fa4f3/conf/examples/vfs-classloader/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/vfs-classloader/accumulo-site.xml b/conf/examples/vfs-classloader/accumulo-site.xml index 7ba3f97..ea95ea2 100644 --- a/conf/examples/vfs-classloader/accumulo-site.xml +++ b/conf/examples/vfs-classloader/accumulo-site.xml @@ -100,7 +100,7 @@ $HADOOP_CONF_DIR, $HADOOP_PREFIX/[^.].*.jar, $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1.2 --> + <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
