Viewing all changes in revision 569.1.82.
- Committer: Cerberus
- Date: 2011-02-28 17:39:23 UTC
- mfrom: (749 nova)
- mto: This revision was merged to the branch mainline in revision 762.
- Revision ID: matt.dietz@rackspace.com-20110228173923-1e3upi2ddoc2j4xl
Merge from trunk and merge conflict resolution
- files added:
- doc/.autogenerated
- doc/build/html
- doc/source/runnova
- files removed:
- babel.cfg
- contrib/puppet
- contrib/puppet/files
- contrib/puppet/files/etc
- contrib/puppet/files/etc/default
- contrib/puppet/files/etc/libvirt
- contrib/puppet/files/etc/lvm
- contrib/puppet/files/production
- contrib/puppet/manifests
- contrib/puppet/manifests/classes
- contrib/puppet/templates
- contrib/puppet/templates/production
- doc/source/adminguide
- doc/source/adminguide/distros
- files renamed:
- locale/ => po/
- smoketests/user_smoketests.py => smoketests/sysadmin_smoketests.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
