Viewing all changes in revision 1162.
- Committer: Lorin Hochstein
- Date: 2011-07-12 01:17:03 UTC
- mfrom: (1108.2.157 nova)
- Revision ID: lorin@isi.edu-20110712011703-gzsab9averhjfw28
Merge from trunk
- files added:
- bin/instance-usage-audit
- nova/tests/api/openstack/contrib
- plugins/xenserver/xenapi/contrib
- plugins/xenserver/xenapi/contrib/rpmbuild
- plugins/xenserver/xenapi/contrib/rpmbuild/SPECS
- files removed:
- doc/build/html
- nova/tests/network
- files modified:
- .mailmap
expand all
collapse all
added
removed
doc/source/images/multinic_dhcp.png
doc/source/images/multinic_flat.png
doc/source/images/multinic_vlan.png
