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

..

io

Merge branch '240'

2015-06-17 10:43:40 -05:00

__init__.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

test_connection.py

Revert "Revert "Merge pull request #298 from datastax/PYTHON-108""

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

test_control_connection.py

Update unit tests for new refresh_schema signature.

2015-05-06 16:29:23 -05:00

test_exception.py

Test for PYTHON-180

2014-12-16 01:13:17 -08:00

test_host_connection_pool.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

test_marshalling.py

Update unit tests for corrected small/tiny int types

2015-05-19 08:52:35 -05:00

test_metadata.py

Update CQL keywords, expose in API docs.

2015-05-28 11:06:37 -05:00

test_orderedmap.py

Merge branch 'cqlengine-integration'

2015-03-17 10:54:31 -05:00

test_parameter_binding.py

UNSET Prepared test updates

2015-05-26 16:28:01 -05:00

test_policies.py

Test infinite max attempts for ConstantReconnectionPolicy

2015-05-26 12:10:28 -05:00

test_response_future.py

Revert "Revert "Merge pull request #298 from datastax/PYTHON-108""

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

test_sortedset.py

Update copyright in core files

2015-02-10 12:02:01 -06:00

test_time_util.py

Windows testing support and stabilizations

2015-06-12 16:16:19 -07:00

test_types.py

Update unit tests for corrected small/tiny int types

2015-05-19 08:52:35 -05:00