Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/435f1b72 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/435f1b72 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/435f1b72 Branch: refs/heads/trunk Commit: 435f1b72c6248625933efade3d9f8b6a301f31d9 Parents: 2e4d709 4a6f8a6 Author: Jonathan Ellis <[email protected]> Authored: Wed Dec 18 18:01:34 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Dec 18 18:01:34 2013 -0600 ---------------------------------------------------------------------- .../cassandra/thrift/SSLTransportFactory.java | 86 ++++++++++++++++++++ 1 file changed, 86 insertions(+) ----------------------------------------------------------------------
