Tyler Hobbs 80715767a6 Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/connection.py
	requirements.txt
	setup.py
	tests/unit/test_connection.py
	tox.ini

2014-05-07 17:06:13 -05:00

10 KiB

Raw Blame History

View Raw