Tyler Hobbs 4c82e99d8b Merge branch 'master' into 2.1-support ...

Conflicts:
	cassandra/protocol.py

2014-06-17 11:57:02 -05:00

..

integration

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

unit

Merge branch 'master' into 2.1-support

2014-06-17 11:57:02 -05:00

__init__.py

Add test logger if not added by nose

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