Merge remote branch 'origin/dev' into dev

2011-08-18 08:32:33 +01:00 · 2011-08-18 08:32:33 +01:00 · d6c54c7c2a
commit d6c54c7c2a
parent bda716ef9d d83d226396
1 changed files with 4 additions and 0 deletions
--- a/mongoengine/queryset.py
+++ b/mongoengine/queryset.py
@ -902,6 +902,10 @@ class QuerySet(object):
           :meth:`~pymongo.collection.Collection.map_reduce` helper requires
           PyMongo version **>= 1.11**.

+        .. versionchanged:: 0.5
+           - removed ``keep_temp`` keyword argument, which was only relevant
+             for MongoDB server versions older than 1.7.4
+
        .. versionadded:: 0.3
        """
        from document import MapReduceDocument