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

..

columns.rst

Remove deprecated cqlengine.Model.__polymorphic_*__ attributes

2015-10-06 14:38:36 -05:00

connection.rst

Additional methods for setting up mapper session.

2015-02-10 13:57:36 -06:00

management.rst

Add User Definted Types to mapper.

2015-03-03 13:02:35 -06:00

models.rst

PYTHON-336 test tweaks and changelog

2016-02-23 13:33:09 -06:00

query.rst

Merge remote-tracking branch 'origin/3.1'

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

usertype.rst

Add User Definted Types to mapper.

2015-03-03 13:02:35 -06:00