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

..

api

Merge branch 'master' into 2.0

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

conf.py

Bump version to 1.0.0, update changelog, setup.py, README

2014-01-29 12:59:28 -06:00

getting_started.rst

Minor doc fixes, raise version to 1.0.2.post

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

index.rst

Documentation for auto paging

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

installation.rst

added link to SSL setup post

2014-01-29 15:57:34 -08:00

Makefile

Initial doc setup

2013-07-01 11:54:42 -05:00

performance.rst

fix it there too.

2014-02-04 09:44:01 -08:00

query_paging.rst

Documentation for auto paging

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