Adam Holmberg ee2243c217 Revert "Revert "Merge pull request #298 from datastax/PYTHON-108"" ...

This reverts commit dfa91b8bd5.

Conflicts:
	cassandra/cluster.py
	cassandra/connection.py
	cassandra/io/asyncorereactor.py
	cassandra/io/eventletreactor.py
	cassandra/io/geventreactor.py
	cassandra/io/libevreactor.py
	cassandra/io/twistedreactor.py
	cassandra/query.py

2015-06-19 10:10:17 -05:00

22 KiB

Raw Permalink Blame History

View Raw