Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f2c0c16d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f2c0c16d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f2c0c16d Branch: refs/heads/ACCUMULO-378 Commit: f2c0c16db3f37d630f0616aabe3a18f7deee64a5 Parents: e117a78 900d6ab Author: Josh Elser <els...@apache.org> Authored: Fri May 9 11:26:17 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri May 9 11:26:17 2014 -0400 ---------------------------------------------------------------------- README | 2 +- assemble/pom.xml | 2 +- assemble/src/main/assemblies/component.xml | 2 +- .../accumulo/core/conf/ConfigurationDocGen.java | 72 +- .../core/conf/DefaultConfiguration.java | 4 +- .../accumulo/core/conf/config-header.html | 2 - .../apache/accumulo/core/conf/config-header.tex | 99 --- .../apache/accumulo/core/conf/config-header.txt | 93 +++ docs/pom.xml | 67 +- .../main/asciidoc/accumulo_user_manual.asciidoc | 62 ++ .../main/asciidoc/chapters/administration.txt | 396 +++++++++ docs/src/main/asciidoc/chapters/analytics.txt | 229 ++++++ docs/src/main/asciidoc/chapters/clients.txt | 320 ++++++++ docs/src/main/asciidoc/chapters/design.txt | 179 +++++ .../asciidoc/chapters/development_clients.txt | 107 +++ .../asciidoc/chapters/high_speed_ingest.txt | 125 +++ .../src/main/asciidoc/chapters/introduction.txt | 25 + docs/src/main/asciidoc/chapters/multivolume.txt | 82 ++ docs/src/main/asciidoc/chapters/security.txt | 176 ++++ docs/src/main/asciidoc/chapters/shell.txt | 129 +++ .../asciidoc/chapters/table_configuration.txt | 635 +++++++++++++++ .../src/main/asciidoc/chapters/table_design.txt | 336 ++++++++ .../main/asciidoc/chapters/troubleshooting.txt | 758 ++++++++++++++++++ docs/src/main/asciidoc/images/accumulo-logo.png | Bin 0 -> 11427 bytes .../main/asciidoc/images/data_distribution.png | Bin 0 -> 86937 bytes .../main/asciidoc/images/failure_handling.png | Bin 0 -> 48905 bytes .../accumulo_user_manual.tex | 55 -- .../chapters/administration.tex | 431 ---------- .../accumulo_user_manual/chapters/analytics.tex | 248 ------ .../accumulo_user_manual/chapters/clients.tex | 331 -------- .../accumulo_user_manual/chapters/design.tex | 186 ----- .../chapters/development_clients.tex | 109 --- .../chapters/high_speed_ingest.tex | 133 ---- .../chapters/introduction.tex | 27 - .../chapters/multivolume.tex | 85 -- .../accumulo_user_manual/chapters/security.tex | 179 ----- .../accumulo_user_manual/chapters/shell.tex | 138 ---- .../chapters/table_configuration.tex | 663 ---------------- .../chapters/table_design.tex | 343 -------- .../chapters/troubleshooting.tex | 794 ------------------- .../images/data_distribution.png | Bin 86937 -> 0 bytes .../images/failure_handling.png | Bin 48905 -> 0 bytes .../zookeeper/RetryingInvocationHandler.java | 63 ++ .../fate/zookeeper/ZooReaderWriter.java | 24 +- .../RetryingInvocationHandlerTest.java | 87 ++ pom.xml | 12 +- .../zookeeper/ZooReaderWriterFactory.java | 88 ++ 47 files changed, 3994 insertions(+), 3904 deletions(-) ----------------------------------------------------------------------
