Adam Holmberg 50a314da85 Merge branch 'cqlengine-integration' ...

Conflicts:
	tests/unit/test_policies.py
	tests/unit/test_types.py

2015-03-17 10:54:31 -05:00

..

cassandra

Merge branch 'cqlengine-integration'

2015-03-17 10:54:31 -05:00

cassandra.rst

Update API documentation

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

index.rst

Add User Definted Types to mapper.

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