Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/thrift/SSLTransportFactory.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7266855
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7266855
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7266855
Branch: refs/heads/trunk
Commit: f7266855218b8e9eb34a62ad933c4ed889a71c64
Parents: 3afd0a8 2601604
Author: Jason Brown <jasobr...@apple.com>
Authored: Mon Oct 6 14:56:35 2014 -0700
Committer: Jason Brown <jasobr...@apple.com>
Committed: Mon Oct 6 14:56:35 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/thrift/SSLTransportFactory.java | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7266855/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7266855/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java
----------------------------------------------------------------------
