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

Conflicts: docs/changelog.rst
2012-06-18 21:10:14 +01:00
parent bd41c6eea4 a856c7cc37
commit 766d54795f
6 changed files with 44 additions and 2 deletions
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -656,6 +656,7 @@ class ReferenceField(BaseField):
      * NULLIFY     - Updates the reference to null.
      * CASCADE     - Deletes the documents associated with the reference.
      * DENY        - Prevent the deletion of the reference object.
+      * PULL        - Pull the reference from a :class:`~mongoengine.ListField` of references

    Alternative syntax for registering delete rules (useful when implementing
    bi-directional delete rules)