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/dee30cc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dee30cc6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dee30cc6 Branch: refs/heads/trunk Commit: dee30cc632dd5f6d1c9088a2177fb0b1b0b7fedb Parents: 75b9ea4 9d6afb4 Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 13:33:22 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 13:33:22 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/MessagingService.java | 2 +- src/java/org/apache/cassandra/security/SSLFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dee30cc6/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
