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

..

cqlengine

Deprecate cqlengine.Float(double_precision=True)

2015-04-20 16:50:33 -05:00

io

Add EventletConnection to API docs.

2015-01-20 13:55:32 -06:00

auth.rst

Update saslauth added ver. Add SaslAuth to API docs.

2015-01-26 15:21:05 -06:00

cluster.rst

Add docs for ResponseFuture.custom_paylaod

2015-04-24 10:24:37 -05:00

concurrent.rst

Docs for cassandra.concurrent

2014-04-03 17:14:01 -05:00

connection.rst

Update API documentation

2014-01-17 14:16:25 -06:00

decoder.rst

Add missing 'versionadded' directives, minor cleanup

2014-05-28 14:32:05 -05:00

encoder.rst

Handle custom encoders in nested data types

2014-07-22 14:21:04 -05:00

metadata.rst

Doc update for function and aggregate metadata

2015-04-14 16:52:21 -05:00

metrics.rst

Docs for cassandra.encoder

2014-07-18 15:45:00 -05:00

policies.rst

Add WhiteListRRPolicy to API docs

2014-05-14 12:28:28 -05:00

pool.rst

Update API documentation

2014-01-17 14:16:25 -06:00

protocol.rst

Add the missing protocol doc file

2015-04-20 14:22:09 -05:00

query.rst

Handle custom encoders in nested data types

2014-07-22 14:21:04 -05:00

util.rst

cassandra.util doc update to include time functions

2015-03-09 11:58:19 -05:00