Merge branch 'cassandra-2.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/9d6afb4b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d6afb4b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d6afb4b Branch: refs/heads/trunk Commit: 9d6afb4b7598745b276bb2332a2499811da9637a Parents: d38f677 4b3a17c Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 13:33:12 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 13:33:12 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/9d6afb4b/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
