Merge branch 'accumulo-4531'

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

Branch: refs/heads/master
Commit: 13201a814840483238e45d104a9a7644ffca6720
Parents: bebfbd0 c0e68a3
Author: Mike Walch <mwa...@apache.org>
Authored: Tue Dec 6 14:13:53 2016 -0500
Committer: Mike Walch <mwa...@apache.org>
Committed: Tue Dec 6 14:13:53 2016 -0500

----------------------------------------------------------------------
 .../main/asciidoc/chapters/administration.txt   |   6 +
 docs/src/main/asciidoc/chapters/analytics.txt   |   3 +-
 docs/src/main/asciidoc/chapters/clients.txt     |  20 +-
 .../asciidoc/chapters/high_speed_ingest.txt     |   7 +-
 docs/src/main/asciidoc/chapters/sampling.txt    |  10 +-
 .../asciidoc/chapters/table_configuration.txt   |  25 ++-
 docs/src/main/resources/administration.html     | 201 -----------------
 docs/src/main/resources/bulkIngest.html         | 114 ----------
 docs/src/main/resources/combiners.html          |  87 --------
 docs/src/main/resources/constraints.html        |  50 -----
 docs/src/main/resources/distributedTracing.html | 106 ---------
 docs/src/main/resources/documentation.css       | 112 ----------
 docs/src/main/resources/examples/README         |  97 --------
 docs/src/main/resources/examples/README.batch   |  55 -----
 docs/src/main/resources/examples/README.bloom   | 219 ------------------
 .../main/resources/examples/README.bulkIngest   |  33 ---
 .../main/resources/examples/README.classpath    |  68 ------
 docs/src/main/resources/examples/README.client  |  79 -------
 .../src/main/resources/examples/README.combiner |  70 ------
 .../examples/README.compactionStrategy          |  65 ------
 .../main/resources/examples/README.constraints  |  54 -----
 docs/src/main/resources/examples/README.dirlist | 114 ----------
 docs/src/main/resources/examples/README.export  |  91 --------
 .../src/main/resources/examples/README.filedata |  47 ----
 docs/src/main/resources/examples/README.filter  | 110 ---------
 .../main/resources/examples/README.helloworld   |  47 ----
 .../main/resources/examples/README.isolation    |  50 -----
 docs/src/main/resources/examples/README.mapred  | 154 -------------
 .../main/resources/examples/README.maxmutation  |  49 ----
 docs/src/main/resources/examples/README.regex   |  57 -----
 .../main/resources/examples/README.reservations |  66 ------
 .../main/resources/examples/README.rgbalancer   | 159 -------------
 docs/src/main/resources/examples/README.rowhash |  59 -----
 docs/src/main/resources/examples/README.sample  | 192 ----------------
 docs/src/main/resources/examples/README.shard   |  66 ------
 .../main/resources/examples/README.tabletofile  |  59 -----
 .../src/main/resources/examples/README.terasort |  50 -----
 .../main/resources/examples/README.visibility   | 131 -----------
 docs/src/main/resources/examples/batch.md       |  57 +++++
 docs/src/main/resources/examples/bloom.md       | 221 +++++++++++++++++++
 docs/src/main/resources/examples/bulkIngest.md  |  35 +++
 docs/src/main/resources/examples/classpath.md   |  69 ++++++
 docs/src/main/resources/examples/client.md      |  81 +++++++
 docs/src/main/resources/examples/combiner.md    |  72 ++++++
 .../resources/examples/compactionStrategy.md    |  67 ++++++
 docs/src/main/resources/examples/constraints.md |  56 +++++
 docs/src/main/resources/examples/dirlist.md     | 118 ++++++++++
 docs/src/main/resources/examples/export.md      |  93 ++++++++
 docs/src/main/resources/examples/filedata.md    |  51 +++++
 docs/src/main/resources/examples/filter.md      | 112 ++++++++++
 docs/src/main/resources/examples/helloworld.md  |  49 ++++
 docs/src/main/resources/examples/index.md       | 100 +++++++++
 docs/src/main/resources/examples/isolation.md   |  51 +++++
 docs/src/main/resources/examples/mapred.md      | 156 +++++++++++++
 docs/src/main/resources/examples/maxmutation.md |  51 +++++
 docs/src/main/resources/examples/regex.md       |  59 +++++
 .../src/main/resources/examples/reservations.md |  68 ++++++
 docs/src/main/resources/examples/rgbalancer.md  | 161 ++++++++++++++
 docs/src/main/resources/examples/rowhash.md     |  61 +++++
 docs/src/main/resources/examples/sample.md      | 193 ++++++++++++++++
 docs/src/main/resources/examples/shard.md       |  68 ++++++
 docs/src/main/resources/examples/tabletofile.md |  61 +++++
 docs/src/main/resources/examples/terasort.md    |  52 +++++
 docs/src/main/resources/examples/visibility.md  | 133 +++++++++++
 docs/src/main/resources/index.html              |  39 ----
 docs/src/main/resources/isolation.html          |  51 -----
 docs/src/main/resources/lgroups.html            |  45 ----
 docs/src/main/resources/metrics.html            | 151 -------------
 docs/src/main/resources/timestamps.html         | 160 --------------
 69 files changed, 2334 insertions(+), 3389 deletions(-)
----------------------------------------------------------------------


Reply via email to