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/88d4a14a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88d4a14a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88d4a14a Branch: refs/heads/trunk Commit: 88d4a14a885274837898853d3ec4c11223aa8a73 Parents: e15cf78 5615a79 Author: Jason Brown <[email protected]> Authored: Wed Nov 12 16:16:59 2014 -0800 Committer: Jason Brown <[email protected]> Committed: Wed Nov 12 16:16:59 2014 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/security/SSLFactory.java | 10 +++++----- .../apache/cassandra/thrift/CustomTThreadPoolServer.java | 3 ++- src/java/org/apache/cassandra/transport/Server.java | 2 +- src/java/org/apache/cassandra/transport/SimpleClient.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d4a14a/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d4a14a/src/java/org/apache/cassandra/transport/SimpleClient.java ----------------------------------------------------------------------
