ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9ee274d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9ee274d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d9ee274d Branch: refs/heads/1.6.1-SNAPSHOT Commit: d9ee274dcf9b6ce18e2cf7d6fa8304cf516df154 Parents: 8f1dc65 Author: Josh Elser <els...@apache.org> Authored: Thu Jun 19 21:32:03 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 19 21:33:16 2014 -0700 ---------------------------------------------------------------------- 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/d9ee274d/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 b68059c..cc06eea 100644 --- a/conf/examples/1GB/native-standalone/accumulo-site.xml +++ b/conf/examples/1GB/native-standalone/accumulo-site.xml @@ -107,7 +107,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 1bca857..96e647a 100644 --- a/conf/examples/1GB/standalone/accumulo-site.xml +++ b/conf/examples/1GB/standalone/accumulo-site.xml @@ -107,7 +107,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 9eaa5ff..75f7754 100644 --- a/conf/examples/2GB/native-standalone/accumulo-site.xml +++ b/conf/examples/2GB/native-standalone/accumulo-site.xml @@ -97,7 +97,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 c9e0309..0b992c9 100644 --- a/conf/examples/2GB/standalone/accumulo-site.xml +++ b/conf/examples/2GB/standalone/accumulo-site.xml @@ -110,7 +110,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 9b82ed3..7f245a7 100644 --- a/conf/examples/3GB/native-standalone/accumulo-site.xml +++ b/conf/examples/3GB/native-standalone/accumulo-site.xml @@ -92,7 +92,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 a127cbd..f36a92d 100644 --- a/conf/examples/3GB/standalone/accumulo-site.xml +++ b/conf/examples/3GB/standalone/accumulo-site.xml @@ -97,7 +97,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 0e8bdb2..2e7af84 100644 --- a/conf/examples/512MB/native-standalone/accumulo-site.xml +++ b/conf/examples/512MB/native-standalone/accumulo-site.xml @@ -102,7 +102,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 1a30ce7..f677960 100644 --- a/conf/examples/512MB/standalone/accumulo-site.xml +++ b/conf/examples/512MB/standalone/accumulo-site.xml @@ -108,7 +108,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/crypto/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/crypto/accumulo-site.xml b/conf/examples/crypto/accumulo-site.xml index a7e5c54..b905017 100644 --- a/conf/examples/crypto/accumulo-site.xml +++ b/conf/examples/crypto/accumulo-site.xml @@ -104,7 +104,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/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 ea95ea2..2578fc8 100644 --- a/conf/examples/vfs-classloader/accumulo-site.xml +++ b/conf/examples/vfs-classloader/accumulo-site.xml @@ -102,7 +102,7 @@ $HADOOP_PREFIX/lib/[^.].*.jar, <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, - $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar, + $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar, $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
