This is an automated email from the ASF dual-hosted git repository. mwalch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
commit fe236f51395730a86db9ef2d6610985dbfce85da Merge: 99166db 43b167d Author: Mike Walch <mwa...@apache.org> AuthorDate: Wed Nov 14 17:30:34 2018 -0500 Merge pull request #129 from mikewalch/security Updated Security documentation _docs-2/development/mapreduce.md | 8 +- _docs-2/getting-started/clients.md | 13 ++-- _docs-2/getting-started/features.md | 2 +- _docs-2/getting-started/table_configuration.md | 2 +- _docs-2/getting-started/table_design.md | 2 +- _docs-2/security/authentication.md | 92 +++++++++++++++++++++++ _docs-2/security/{labels.md => authorizations.md} | 60 ++++++++++----- _docs-2/security/kerberos.md | 49 ++++++------ _docs-2/security/on-disk-encryption.md | 2 +- _docs-2/security/overview.md | 68 ++++++----------- _docs-2/security/permissions.md | 72 ++++++++++++++++++ _docs-2/security/wire-encryption.md | 2 +- 12 files changed, 269 insertions(+), 103 deletions(-)