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

..

io

Document reactors, metadata, rename pyev* to libev*

2013-07-02 16:49:23 -05:00

cluster.rst

Documentation for auto paging

2014-04-03 15:11:13 -05:00

concurrent.rst

Docs for cassandra.concurrent

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

connection.rst

Update API documentation

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

metadata.rst

Update API docs for 1.0.0-beta3

2013-09-20 13:39:23 -05:00

policies.rst

Add API docs for TokenAwarePolicy

2013-07-03 12:31:05 -05:00

pool.rst

Update API documentation

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

query.rst

Minor doc fixes, raise version to 1.0.2.post

2014-03-04 11:54:43 -06:00