Adam Holmberg f92bd4c3aa Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	CHANGELOG.rst
	tests/integration/cqlengine/columns/test_validation.py

2016-02-24 14:18:50 -06:00

..

api

Merge remote-tracking branch 'origin/3.1'

2016-02-24 14:18:50 -06:00

cqlengine

Added doc for the CONTAINS operator

2016-02-19 12:47:24 -05:00

themes/custom

Emphasize "version added" in docs

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

conf.py

fix sphinx conf file

2016-01-29 15:48:13 -06:00

faq.rst

Add FAQ section to docs

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

getting_started.rst

doc: missing ')' in code block

2015-12-07 08:26:31 -06:00

index.rst

doc: add discussion about LWT results

2016-01-12 13:50:48 -06:00

installation.rst

doc: more detail about ways to skip cython

2015-12-02 15:52:31 -06:00

lwt.rst

doc typo

2016-01-13 07:11:28 -06: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: Cython built regardless of virtualenv; add xref to installation

2015-08-19 16:24:05 -05:00

query_paging.rst

PYTHON-460: correct docs around default paging behavior

2016-01-05 09:26:43 -06:00

security.rst

Mention SaslAuthProvider in doc security section.

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

upgrading.rst

default consistency is now LOCAL_ONE

2015-11-24 11:24:56 -06:00

user_defined_types.rst

Doc improvements:

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