Merge branch 'cassandra-2.0' into cassandra-2.1

Browse Source

Conflicts:
	CHANGES.txt

...

This commit is contained in:

Brandon Williams 2014-05-28 14:39:54 -05:00

parent bb1deac0b9 999bee7951

commit de0cb79721

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