Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b89ae26 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b89ae26 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b89ae26 Branch: refs/heads/trunk Commit: 0b89ae2601d6a97734087e4e3e05c5750bc5d545 Parents: bb2fdd0 6cc03b9 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jul 10 12:10:56 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jul 10 12:10:56 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/0b89ae26/CHANGES.txt ----------------------------------------------------------------------
