Adam Holmberg 778ef61c52 Merge remote-tracking branch 'cqlengine/master' into cqlengine-integration ...

Conflicts:
	.gitignore
	.travis.yml
	LICENSE
	MANIFEST.in
	docs/Makefile
	docs/conf.py
	docs/index.rst
	requirements.txt
	setup.py
	tox.ini

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

..

api

Add new api attributes and functions to docs.

2015-01-28 16:25:26 -06:00

themes/custom

Emphasize "version added" in docs

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

topics

removed references to create_missing_keyspace #323

2015-01-16 10:15:37 -08:00

conf.py

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

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

getting_started.rst

Doc improvements:

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

index.rst

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

2015-02-03 14:38:01 -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

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