Merge branch 'cassandra-1.2' into cassandra-2.0

Browse Source

Conflicts:
	CHANGES.txt

...

This commit is contained in:

Aleksey Yeschenko 2014-05-28 23:23:52 +03:00

parent 35efdc1e39 a37482144f

commit 04ba46231d

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