Adam Holmberg 124b81b4dc Merge branch 'master' into 276 ...

Conflicts:
	cassandra/__init__.py
	cassandra/cluster.py
	cassandra/connection.py
	cassandra/metadata.py
	cassandra/protocol.py
	tests/integration/__init__.py
	tests/integration/standard/test_metadata.py
	tests/unit/test_control_connection.py

2015-09-04 17:08:56 -05:00

..

cython

pyximport for test helper cython extensions

2015-08-13 19:00:38 -05:00

io

Merge remote-tracking branch 'origin/357' into 2.7

2015-07-22 12:00:56 -05:00

__init__.py

Update copyright in core files

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

test_concurrent.py

Changing tests to be cross python compatible

2015-07-22 16:36:30 -05:00

test_connection.py

Isolate custom protocol handling to client requests.

2015-07-16 15:18:56 -05:00

test_control_connection.py

Merge branch 'master' into 276

2015-09-04 17:08:56 -05:00

test_exception.py

Test for PYTHON-180

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

test_host_connection_pool.py

Optionally error callbacks in thread when defuncting connections

2015-08-04 16:51:49 -05:00

test_marshalling.py

Update unit tests for corrected small/tiny int types

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

test_metadata.py

Merge branch 'master' into 276

2015-09-04 17:08:56 -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

Simplify logic in Downgrading write timeout, and test

2015-07-16 16:08:47 -05:00

test_response_future.py

Merge branch 'master' into 276

2015-09-04 17:08:56 -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

Remove unused CassandraType init, validate

2015-07-22 15:08:42 -05:00

test_util_types.py

Remove unused CassandraType init, validate

2015-07-22 15:08:42 -05:00