Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cc03b96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cc03b96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cc03b96 Branch: refs/heads/cassandra-2.1 Commit: 6cc03b96060c1c2cc7f3a0ee25db7bd89522f934 Parents: 4d8fea1 1a9d4b8 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jul 10 12:10:44 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jul 10 12:10:44 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/security/SSLFactory.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc03b96/CHANGES.txt ----------------------------------------------------------------------
