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

..

integration

Merge branch 'master' into 2.0

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

unit

Merge branch 'master' into 2.0

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

__init__.py

Don't add StreamHandler to test logging setup

2013-06-26 12:48:34 -05:00