Tyler Hobbs 9d4c7842c1 Merge branch '2.0' into py3k ...

Conflicts:
	cassandra/cluster.py
	cassandra/connection.py
	cassandra/io/asyncorereactor.py
	cassandra/io/libevreactor.py
	setup.py
	tests/integration/long/test_large_data.py

2014-04-03 17:45:53 -05:00

..

long

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

standard

Merge branch '2.0' into py3k

2014-04-03 17:45:53 -05:00

__init__.py

Merge branch 'master' into 2.0

2014-04-02 16:17:36 -05:00