Tyler Hobbs b84b6026f2 Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/__init__.py
	tests/integration/standard/test_connection.py

2014-04-22 18:02:04 -05:00

..

integration

Merge branch 'master' into 2.0

2014-04-22 18:02:04 -05:00

unit

Merge branch '2.0' into del-and-daemon-thread-cleanup

2014-04-16 15:20:46 -05:00

__init__.py

Add License headers

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