Repository: flume
Updated Branches:
  refs/heads/flume-1.7 4b8b9d631 -> d4ce4a253


FLUME-2575. FLUME-2548 brings SSLv2Hello back for Avro Sink, but UG says it is 
one of the protocols to exclude

    (Li Xiang via Johny Rufus)


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

Branch: refs/heads/flume-1.7
Commit: d4ce4a2537e5ad0ca9db32a94b74ee9c5fe05561
Parents: 4b8b9d6
Author: Johny Rufus <[email protected]>
Authored: Fri Jul 3 11:22:38 2015 -0700
Committer: Johny Rufus <[email protected]>
Committed: Fri Jul 3 14:52:27 2015 -0700

----------------------------------------------------------------------
 flume-ng-doc/sphinx/FlumeUserGuide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/d4ce4a25/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst 
b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index 39f5bad..024426b 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -1952,7 +1952,7 @@ trust-all-certs              false
 truststore                   --                                                
     The path to a custom Java truststore file. Flume uses the certificate 
authority information in this file to determine whether the remote Avro 
Source's SSL authentication credentials should be trusted. If not specified, 
the default Java JSSE certificate authority files (typically "jssecacerts" or 
"cacerts" in the Oracle JRE) will be used.
 truststore-password          --                                                
     The password for the specified truststore.
 truststore-type              JKS                                               
     The type of the Java truststore. This can be "JKS" or other supported Java 
truststore type.
-exclude-protocols            SSLv2Hello SSLv3                                  
     Space-separated list of SSL/TLS protocols to exclude
+exclude-protocols            SSLv3                                             
     Space-separated list of SSL/TLS protocols to exclude. SSLv3 will always be 
excluded in addition to the protocols specified.
 maxIoWorkers                 2 * the number of available processors in the 
machine  The maximum number of I/O worker threads. This is configured on the 
NettyAvroRpcClient NioClientSocketChannelFactory.
 ==========================   
=====================================================  
===========================================================================================
 

Reply via email to