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

Merge branch 'master' into dev

Browse Source 
Conflicts:
	docs/guide/signals.rst
	python-mongoengine.spec
This commit is contained in:
Ross Lawley 2012-01-16 09:05:38 +00:00
commit 90bfa608dd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/guide/signals.rst
View File

@ -9,7 +9,11 @@ Signal support is provided by the excellent `blinker`_ library and
will gracefully fall back if it is not available. will gracefully fall back if it is not available.
<<<<<<< HEAD
The following document signals exist in MongoEngine and are pretty self explanatory: The following document signals exist in MongoEngine and are pretty self explanatory:
=======
The following document signals exist in MongoEngine and are pretty self-explanatory:
>>>>>>> master
* `mongoengine.signals.pre_init` * `mongoengine.signals.pre_init`
* `mongoengine.signals.post_init` * `mongoengine.signals.post_init`

3
python-mongoengine.spec
View File

@ -22,6 +22,7 @@ Requires: pymongo
Requires: python-blinker Requires: python-blinker
Requires: python-imaging Requires: python-imaging
%description %description
MongoEngine is an ORM-like layer on top of PyMongo. MongoEngine is an ORM-like layer on top of PyMongo.
@ -53,9 +54,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Oct 27 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.3-1 * Thu Oct 27 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.3-1
- Update to latest dev version - Update to latest dev version
* Add PIL dependency for ImageField * Add PIL dependency for ImageField
* Wed Oct 12 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.2-1 * Wed Oct 12 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.2-1
- Update version - Update version
* Fri Sep 23 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.0-1 * Fri Sep 23 2011 Pau Aliagas <linuxnow@gmail.com> 0.5.0-1
- Initial version - Initial version