Merge remote-tracking branch 'origin/master' into ACCUMULO-1000
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a169064b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a169064b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a169064b Branch: refs/heads/ACCUMULO-1000 Commit: a169064b93aa1be04507c156fe0092a0cbb8e2ab Parents: 1fadfd2 3d7a6e7 Author: Keith Turner <[email protected]> Authored: Thu Jul 18 15:06:59 2013 -0400 Committer: Keith Turner <[email protected]> Committed: Thu Jul 18 15:06:59 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 +- .../accumulo/core/file/rfile/PrintInfo.java | 2 +- .../security/crypto/CryptoModuleParameters.java | 12 +- .../accumulo_user_manual.tex | 1 + .../chapters/troubleshooting.tex | 520 +++++++++++++++++++ .../apache/accumulo/fate/zookeeper/ZooLock.java | 17 +- maven-plugin/pom.xml | 4 + .../src/it/plugin-test/postbuild.groovy | 3 + .../apache/accumulo/plugin/CustomFilter.java | 33 ++ .../org/apache/accumulo/plugin/PluginIT.java | 44 +- .../maven/plugin/AbstractAccumuloMojo.java | 31 +- .../apache/accumulo/maven/plugin/StartMojo.java | 5 + .../apache/accumulo/maven/plugin/StopMojo.java | 2 + .../minicluster/MiniAccumuloConfig.java | 1 + pom.xml | 9 + .../org/apache/accumulo/server/Accumulo.java | 4 +- .../org/apache/accumulo/server/util/Admin.java | 2 +- .../accumulo/server/util/DumpZookeeper.java | 4 +- .../accumulo/server/util/ListInstances.java | 35 +- .../accumulo/server/util/RestoreZookeeper.java | 5 +- .../accumulo/server/util/TabletServerLocks.java | 9 +- .../start/classloader/AccumuloClassLoader.java | 9 +- .../functional/BulkSplitOptimizationIT.java | 2 - .../test/functional/DynamicThreadPoolsIT.java | 29 +- .../accumulo/test/functional/MacTest.java | 2 +- .../accumulo/test/functional/SplitIT.java | 8 +- .../test/functional/ZookeeperRestartIT.java | 81 +++ 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 +- 53 files changed, 875 insertions(+), 148 deletions(-) ----------------------------------------------------------------------
