accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [10/50] git commit: Merge branch '1.5.1-SNAPSHOT'
Date Tue, 23 Jul 2013 16:54:35 GMT
Merge branch '1.5.1-SNAPSHOT'


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

Branch: refs/heads/ACCUMULO-1000
Commit: e6d6fab048174c2a6e8d1c769a8f25e6aece98ee
Parents: a131e5d c82c431
Author: Eric Newton <eric.newton@gmail.com>
Authored: Wed Jul 17 11:57:38 2013 -0400
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Wed Jul 17 11:57:38 2013 -0400

----------------------------------------------------------------------
 README                                          | 10 ++---
 bin/accumulo                                    |  4 +-
 bin/config.sh                                   | 41 +++++++++++++++-----
 bin/start-all.sh                                |  8 ++--
 bin/start-here.sh                               |  6 +--
 bin/start-server.sh                             |  2 +-
 bin/stop-all.sh                                 |  4 +-
 bin/stop-here.sh                                |  4 +-
 bin/tdown.sh                                    |  2 +-
 bin/tup.sh                                      |  2 +-
 .../1GB/native-standalone/accumulo-env.sh       |  4 +-
 conf/examples/1GB/standalone/accumulo-env.sh    |  4 +-
 .../2GB/native-standalone/accumulo-env.sh       |  4 +-
 conf/examples/2GB/standalone/accumulo-env.sh    |  4 +-
 .../3GB/native-standalone/accumulo-env.sh       |  4 +-
 conf/examples/3GB/standalone/accumulo-env.sh    |  4 +-
 .../512MB/native-standalone/accumulo-env.sh     |  4 +-
 conf/examples/512MB/standalone/accumulo-env.sh  |  4 +-
 .../org/apache/accumulo/server/Accumulo.java    |  4 +-
 .../start/classloader/AccumuloClassLoader.java  |  9 +++--
 test/system/continuous/agitator.pl              |  2 +-
 test/system/continuous/magitator.pl             |  6 +--
 test/system/continuous/mapred-setup.sh          |  2 +-
 test/system/continuous/start-stats.sh           |  2 +-
 test/system/randomwalk/README                   |  2 +-
 test/system/randomwalk/bin/reset-cluster.sh     | 10 ++---
 test/system/randomwalk/bin/start-all.sh         |  4 +-
 test/system/randomwalk/bin/start-local.sh       |  4 +-
 test/system/scalability/run.py                  |  2 +-
 29 files changed, 94 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6d6fab0/README
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6d6fab0/bin/accumulo
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6d6fab0/bin/config.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6d6fab0/bin/start-server.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6d6fab0/server/src/main/java/org/apache/accumulo/server/Accumulo.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6d6fab0/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --cc start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index d9ff8e2,594ad8f..ccd85a6
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@@ -48,9 -45,8 +48,9 @@@ public class AccumuloClassLoader 
    
    public static final String CLASSPATH_PROPERTY_NAME = "general.classpaths";
    
 +  /* @formatter:off */
    public static final String ACCUMULO_CLASSPATH_VALUE = 
-       "$ACCUMULO_HOME/conf,\n" + 
+       "$ACCUMULO_CONF_DIR,\n" + 
            "$ACCUMULO_HOME/lib/[^.].*.jar,\n" + 
            "$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n" + 
            "$HADOOP_CONF_DIR,\n" +


Mime
View raw message