Tyler Hobbs 9effa90f89 Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/cluster.py
	cassandra/concurrent.py
	cassandra/decoder.py
	tests/integration/__init__.py
	tests/integration/long/test_loadbalancingpolicies.py
	tests/integration/standard/test_cluster.py
	tests/integration/standard/test_concurrent.py
	tests/integration/standard/test_connection.py
	tests/integration/standard/test_factories.py
	tests/integration/standard/test_prepared_statements.py
	tests/unit/test_control_connection.py

2014-04-16 15:13:19 -05:00

..

__init__.py

Add License headers

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

test_consistency.py

Add License headers

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

test_large_data.py

Add License headers

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

test_loadbalancingpolicies.py

Merge branch 'master' into 2.0

2014-04-16 15:13:19 -05:00

test_schema.py

Add License headers

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

utils.py

Add License headers

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