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

..

__init__.py

PyCharm auto-code removal

2013-12-17 12:52:35 -06:00

test_cluster.py

Merge branch '2.0' into py3k

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

test_concurrent.py

Add methods for concurrent execution

2014-04-03 16:44:08 -05:00

test_connection.py

Merge branch 'master' into 2.0

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

test_factories.py

Create and switch the PROTOCOL_VERSION for tests

2014-03-27 14:35:06 -05:00

test_metadata.py

Merge branch '2.0' into py3k

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

test_metrics.py

Create and switch the PROTOCOL_VERSION for tests

2014-03-27 14:35:06 -05:00

test_prepared_statements.py

Merge branch '2.0' into py3k

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

test_query_paging.py

Clear table for query paging test

2014-04-03 16:57:37 -05:00

test_query.py

Merge branch '2.0' into py3k

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

test_types.py

Merge branch '2.0' into py3k

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