Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/272ac288 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/272ac288 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/272ac288 Branch: refs/heads/1.8 Commit: 272ac28884af328ff04f342dcfe5a3bb74bc5bfe Parents: 2270bee 52f53f5 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Sep 29 15:38:53 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Sep 29 15:38:53 2016 -0400 ---------------------------------------------------------------------- docs/pom.xml | 6 ++++++ docs/src/main/asciidoc/accumulo_user_manual.asciidoc | 6 +++--- docs/src/main/asciidoc/chapters/administration.txt | 4 ++-- docs/src/main/asciidoc/chapters/clients.txt | 2 +- docs/src/main/asciidoc/chapters/kerberos.txt | 2 +- docs/src/main/resources/examples/README | 2 +- pom.xml | 12 ++++++++++++ 7 files changed, 26 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/asciidoc/accumulo_user_manual.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/asciidoc/chapters/administration.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/resources/examples/README ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/pom.xml ----------------------------------------------------------------------
