Tyler Hobbs 562e2d4e4a Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/cluster.py
	tests/integration/__init__.py
	tests/unit/test_control_connection.py

2014-03-12 17:43:58 -05:00

..

long

Increase default timeout for large data integration tests

2014-02-19 11:45:12 -06:00

standard

Undo param passing for non-prepared statements

2014-03-06 16:51:07 -06:00

__init__.py

Merge branch 'master' into 2.0

2014-03-12 17:43:58 -05:00