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

Conflicts:
	cassandra/protocol.py

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

..

__init__.py

Add License headers

2014-04-16 08:14:24 -07:00

test_cluster.py

Move auth_provider validation to attr setter

2014-05-28 12:10:21 -05:00

test_concurrent.py

Merge branch '2.0'

2014-05-09 14:34:23 -05:00

test_connection.py

Merge branch 'master' into 2.1-support

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

test_factories.py

Add License headers

2014-04-16 08:14:24 -07:00

test_metadata.py

Merge branch 'py3k' into 2.0

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

test_metrics.py

Adding wait_other_notice=True for ccm

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

test_prepared_statements.py

Merge branch 'py3k' into 2.0

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

test_query_paging.py

Use sequence comparison for potentially lazy list

2014-05-02 16:10:23 -05:00

test_query.py

Merge branch '1.x'

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

test_types.py

Fix blob type as string test for C* 1.2, Python 2

2014-05-06 15:24:19 -05:00