Merge branch 'master' of https://github.com/dimonb/mongoengine

Conflicts: mongoengine/base.py
2012-09-03 11:00:41 +01:00
parent 6e7f2b73cf ab60fd0490
commit 52f85aab18
5 changed files with 28 additions and 7 deletions
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog

 Changes in 0.7.X
 =================
+- Fixed reloading on sharded documents (hmarr/mongoengine#569)
 - Added NotUniqueError for duplicate keys (MongoEngine/mongoengine#62)
 - Added custom collection / sequence naming for SequenceFields (MongoEngine/mongoengine#92)
 - Fixed UnboundLocalError in composite index with pk field (MongoEngine/mongoengine#88)