Tyler Hobbs 80715767a6 Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/connection.py
	requirements.txt
	setup.py
	tests/unit/test_connection.py
	tox.ini

2014-05-07 17:06:13 -05:00

..

integration

Tolerate multiple calls of Cluster.shutdown()

2014-05-06 16:33:07 -05:00

unit

Merge branch 'master' into 2.0

2014-05-07 17:06:13 -05:00

__init__.py

Add test logger if not added by nose

2014-05-02 18:46:13 -05:00