Viewing all changes in revision 527.
- Committer: Sandy Walsh
- Date: 2011-01-06 02:23:23 UTC
- mfrom: (515.3.7 nova)
- Revision ID: sandy.walsh@rackspace.com-20110106022323-j94e9paiw3jolghc
Fixed trunk merge conflicts as spotted by dubs.
- files added:
- nova/compute/__init__.py
- files removed:
- doc/.autogenerated
- files renamed:
- nova/network/__init__.py => nova/network/api.py
- nova/volume/__init__.py => nova/volume/api.py
- files modified:
- .mailmap
expand all
collapse all
added
removed
