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

..

integration

Merge branch 'master' into 276

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

stress_tests

Python 3 compatibility for stress tests

2015-08-07 16:12:06 +01:00

unit

Merge branch 'master' into 276

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

__init__.py

Adding timer tests for async, libev, and twisted. Added integration tests. All for PYTHON-108

2015-07-20 17:16:36 -05:00