Merge branch 'dev-disable-indexing' of https://github.com/colinhowe/mongoengine

Conflicts: mongoengine/queryset.py
2012-05-01 09:37:01 +01:00
parent 530440b333 7e376b40bb
commit 4ce1ba81a6
4 changed files with 88 additions and 51 deletions
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog

 Changes in 0.6.X
 ================
+- Added meta `auto_create_index` so you can disable index creation
 - Added write concern options to inserts
 - Fixed typo in meta for index options
 - Bug fix Read preference now passed correctly