Merge branch 'cassandra-2.1' into cassandra-2.2

Browse Source

Conflicts:
	lib/licenses/crc32ex-0.1.1.txt
	lib/licenses/snappy-java-1.0.5.2.txt
	lib/licenses/snappy-java-1.0.5.txt
	lib/licenses/snappy-java-1.1.1.7.txt
	lib/licenses/thrift-server-0.3.5.txt
	lib/licenses/thrift-server-0.3.7.txt

...

This commit is contained in:

Dave Brosius 2016-07-01 16:10:55 -04:00

parent da20fece74 bd6ad43b9c

commit 65f8bb6c46

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