Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E62B017914 for ; Wed, 6 May 2015 15:45:30 +0000 (UTC) Received: (qmail 73136 invoked by uid 500); 6 May 2015 15:45:30 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 73107 invoked by uid 500); 6 May 2015 15:45:30 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 73095 invoked by uid 99); 6 May 2015 15:45:30 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2015 15:45:30 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id A744AAC010F for ; Wed, 6 May 2015 15:45:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1678032 - /zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Date: Wed, 06 May 2015 15:45:30 -0000 To: commits@zookeeper.apache.org From: hdeng@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150506154530.A744AAC010F@hades.apache.org> Author: hdeng Date: Wed May 6 15:45:30 2015 New Revision: 1678032 URL: http://svn.apache.org/r1678032 Log: ZOOKEEPER-2153 X509 Authentication Documentation (Ian Dimayuga via hdeng) Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1678032&r1=1678031&r2=1678032&view=diff ============================================================================== --- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original) +++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Wed May 6 15:45:30 2015 @@ -1140,7 +1140,7 @@ server.3=zoo3:2888:3888 to use for secure client authentication. This is useful in certificate key infrastructures that do not use JKS. It may be necessary to extend javax.net.ssl.X509KeyManager - and javax.net.ssl.X509TrustManager + and javax.net.ssl.X509TrustManager to get the desired behavior from the SSL stack. To configure the ZooKeeper server to use the custom provider for authentication, choose a scheme name for the custom AuthenticationProvider and