Tyler Hobbs 4c82e99d8b Merge branch 'master' into 2.1-support ...

Conflicts:
	cassandra/protocol.py

2014-06-17 11:57:02 -05:00

..

long

Set the protocol_version in test_schema tests

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

standard

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

__init__.py

Adding wait_other_notice=True for ccm

2014-06-06 20:00:12 -05:00