Adam Holmberg 264fab97ef Merge branch '3.0' ...

Conflicts:
	cassandra/metadata.py
	tests/integration/__init__.py
	tests/integration/standard/test_metadata.py

2015-05-15 14:56:59 -05:00

..

api

Merge branch '3.0'

2015-05-15 14:56:59 -05:00

cqlengine

Fix cqlengine UDT example in docs

2015-04-27 09:37:31 -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

getting_started.rst

Add new date, time to CQL literal encoding table.

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

index.rst

Add note about different version support in cqlengine

2015-02-09 14:37:52 -06: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 "Merge pull request #298 from datastax/PYTHON-108"

2015-05-15 14:46:06 -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