Tyler Hobbs d83264d332 Merge branch '1.x' ...

Conflicts:
	CHANGELOG.rst
	cassandra/cluster.py
	cassandra/query.py
	tests/integration/standard/test_query.py

2014-05-09 17:17:41 -05:00

29 KiB

Raw Blame History

View Raw