Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eac5f892 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eac5f892 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eac5f892 Branch: refs/heads/master Commit: eac5f8927e0d431984c799dd07f63f81d2dc855c Parents: 7fe029f 272ac28 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Sep 29 16:00:46 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Sep 29 16:00:46 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/eac5f892/docs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/docs/src/main/asciidoc/chapters/administration.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/docs/src/main/asciidoc/chapters/kerberos.txt ---------------------------------------------------------------------- diff --cc docs/src/main/asciidoc/chapters/kerberos.txt index 958133c,a165221..7817c8d --- a/docs/src/main/asciidoc/chapters/kerberos.txt +++ b/docs/src/main/asciidoc/chapters/kerberos.txt @@@ -558,5 -558,5 +558,5 @@@ Caused by: org.apache.thrift.transport. on, is extremely important when negotiating an SASL connection. This problem commonly arises when the Accumulo servers are not configured to listen on the address denoted by their FQDN. -The values in the Accumulo "hosts" files (In +$ACCUMULO_CONF_DIR+: +masters+, +monitors+, +slaves+, +tracers+, +The values in the Accumulo "hosts" files (In +$ACCUMULO_CONF_DIR+: +masters+, +monitors+, +tservers+, +tracers+, - and +gc+) should match the instance componentof the Kerberos server principal (e.g. +host+ in +accumulo/host\@EXAMPLE.COM+). + and +gc+) should match the instance componentof the Kerberos server principal (e.g. +host+ in +accumulo/h...@example.com+). http://git-wip-us.apache.org/repos/asf/accumulo/blob/eac5f892/pom.xml ----------------------------------------------------------------------
