Adam Holmberg ee2243c217 Revert "Revert "Merge pull request #298 from datastax/PYTHON-108"" ...

This reverts commit dfa91b8bd5.

Conflicts:
	cassandra/cluster.py
	cassandra/connection.py
	cassandra/io/asyncorereactor.py
	cassandra/io/eventletreactor.py
	cassandra/io/geventreactor.py
	cassandra/io/libevreactor.py
	cassandra/io/twistedreactor.py
	cassandra/query.py

2015-06-19 10:10:17 -05:00

..

api

cqle doc: deprecated TimeUUID.from_datetime

2015-06-12 10:40:44 -05:00

cqlengine

cqle doc: deprecated TimeUUID.from_datetime

2015-06-12 10:40:44 -05:00

themes/custom

Emphasize "version added" in docs

2014-08-07 16:32:41 -05:00

conf.py

Make sure column types with add'l init args are documented

2015-02-12 15:11:49 -06:00

faq.rst

Add FAQ section to docs

2015-05-22 09:51:08 -05:00

getting_started.rst

Add new date, time to CQL literal encoding table.

2015-03-24 16:04:21 -05:00

index.rst

cqle: Update docs reflecting new 2.6 compatibility

2015-06-11 11:49:34 -05:00

installation.rst

Doc improvements:

2015-01-07 18:32:29 -08:00

make.bat

Adding sphinx documentation

2012-12-02 10:44:49 -08:00

Makefile

Merge remote-tracking branch 'cqlengine/master' into cqlengine-integration

2015-02-03 14:38:01 -06:00

object_mapper.rst

Revert "Revert "Merge pull request #298 from datastax/PYTHON-108""

2015-06-19 10:10:17 -05:00

performance.rst

Doc improvements:

2015-01-07 18:32:29 -08:00

query_paging.rst

Create Upgrading section of docs

2014-05-28 14:00:56 -05:00

security.rst

Mention SaslAuthProvider in doc security section.

2015-01-26 15:54:01 -06:00

upgrading.rst

Doc improvements:

2015-01-07 18:32:29 -08:00

user_defined_types.rst

Doc improvements:

2015-01-07 18:32:29 -08:00