Viewing all changes in revision 427.
- Committer: Eric Day
- Date: 2010-12-02 17:34:52 UTC
- mfrom: (422.1.14 nova)
- Revision ID: eday@oddments.org-20101202173452-vbgl0b07j6qua36s
Merged trunk and resolved conflicts. Again.
- files modified:
- nova/compute/api.py
expand all
collapse all
added
removed
