pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge in docs/changelog.rst

Browse Source
This commit is contained in:
Yohan Graterol
2014-11-09 21:28:03 -05:00
parent 5583cf0a5f
commit eac4f6062e
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@@ -5,13 +5,10 @@ Changelog
Changes in 0.9.X - DEV Changes in 0.9.X - DEV
====================== ======================
<<<<<<< HEAD
- OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771 - OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
- with_limit_and_skip for count should default like in pymongo #759 - with_limit_and_skip for count should default like in pymongo #759
- Fix storing value of precision attribute in DecimalField #787 - Fix storing value of precision attribute in DecimalField #787
=======
- Set attribute to None does not work (at least for fields with default values) #734 - Set attribute to None does not work (at least for fields with default values) #734
>>>>>>> bdbd495a9e778d12157b789a74e0e00a303b5efd
- Querying by a field defined in a subclass raises InvalidQueryError #744 - Querying by a field defined in a subclass raises InvalidQueryError #744
- Add Support For MongoDB 2.6.X's maxTimeMS #778 - Add Support For MongoDB 2.6.X's maxTimeMS #778
- abstract shouldn't be inherited in EmbeddedDocument # 789 - abstract shouldn't be inherited in EmbeddedDocument # 789