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

..

long

Set the protocol_version in test_schema tests

2014-05-06 15:04:58 -05:00

standard

Merge branch '1.x'

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

__init__.py

Merge branch 'py3k' into 2.0

2014-05-02 15:55:35 -05:00