Merge branch 'cassandra-1.2' into cassandra-2.0

Browse Source

Conflicts:
	src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java

...

This commit is contained in:

Mikhail Stepura 2014-05-01 15:21:01 -07:00

parent 26633caa9c b573d0fb51

commit 4ca1a4d686

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available