Adam Holmberg 264fab97ef Merge branch '3.0' ...

Conflicts:
	cassandra/metadata.py
	tests/integration/__init__.py
	tests/integration/standard/test_metadata.py

2015-05-15 14:56:59 -05:00

..

__init__.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

test_authentication.py

Pass host through to Auth instance in SaslAuthProvider.new_authenticator

2015-05-12 08:08:17 -05:00

test_cluster.py

test for python-206 connect timeouts

2015-05-01 16:29:02 -07:00

test_concurrent.py

Merge branch 'cqlengine-integration'

2015-03-17 10:54:31 -05:00

test_connection.py

Add connect_timeout to cluster and Connection.factory

2015-04-21 14:55:37 -05:00

test_metadata.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

test_metrics.py

Remove operation timeouts for write timeout metrics test

2015-04-16 15:41:58 -07:00

test_prepared_statements.py

Add a test for prepared statements with no column meta

2015-04-08 12:42:51 -05:00

test_query_paging.py

Merge branch 'cqlengine-integration'

2015-03-17 10:54:31 -05:00

test_query.py

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

test_routing.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

test_row_factories.py

Merge branch 'cqlengine-integration'

2015-03-17 10:54:31 -05:00

test_types.py

Don't change blob params for assertion in C* 1.2

2015-04-16 15:25:14 -07:00

test_udts.py

Refactored UDTTests

2015-04-07 17:02:53 -07:00