Tyler Hobbs 9effa90f89 Merge branch 'master' into 2.0 ...

Conflicts:
	cassandra/cluster.py
	cassandra/concurrent.py
	cassandra/decoder.py
	tests/integration/__init__.py
	tests/integration/long/test_loadbalancingpolicies.py
	tests/integration/standard/test_cluster.py
	tests/integration/standard/test_concurrent.py
	tests/integration/standard/test_connection.py
	tests/integration/standard/test_factories.py
	tests/integration/standard/test_prepared_statements.py
	tests/unit/test_control_connection.py

2014-04-16 15:13:19 -05:00

..

cassandra

Merge branch 'master' into 2.0

2014-04-16 15:13:19 -05:00

cassandra.rst

Update API documentation

2014-01-17 14:16:25 -06:00

index.rst

Docs for cassandra.concurrent

2014-04-03 17:14:01 -05:00