Merge lp://qastaging/~yolanda.robla/ubuntu/precise/nova/essex-sru into lp://qastaging/ubuntu/precise-updates/nova
Proposed by
Yolanda Robla
| Status: | Merged |
|---|---|
| Merge reported by: | James Page |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~yolanda.robla/ubuntu/precise/nova/essex-sru |
| Merge into: | lp://qastaging/ubuntu/precise-updates/nova |
| Diff against target: |
2585 lines (+766/-284) 46 files modified
.gitignore (+0/-20) .gitreview (+0/-5) .mailmap (+0/-82) .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py (+22/-6) .pc/fix-pep8-errors.patch/nova/virt/libvirt/connection.py (+24/-10) Authors (+6/-1) ChangeLog (+479/-113) PKG-INFO (+1/-1) debian/changelog (+35/-0) debian/nova-api-ec2.logrotate (+3/-0) debian/nova-api-metadata.logrotate (+3/-0) debian/nova-api-os-compute.logrotate (+3/-0) debian/nova-api.logrotate (+3/-0) debian/nova-cert.logrotate (+3/-0) debian/nova-common.nova-manage.logrotate (+3/-0) debian/nova-compute.logrotate (+3/-0) debian/nova-console.logrotate (+3/-0) debian/nova-consoleauth.logrotate (+3/-0) debian/nova-network.logrotate (+3/-0) debian/nova-network.nova-dhcpbridge.logrotate (+3/-0) debian/nova-objectstore.logrotate (+3/-0) debian/nova-scheduler.logrotate (+3/-0) debian/nova-vncproxy.logrotate (+3/-0) debian/nova-volume.logrotate (+3/-0) debian/nova-xvpvncproxy.logrotate (+4/-1) nova.egg-info/PKG-INFO (+1/-1) nova.egg-info/SOURCES.txt (+0/-3) nova/api/openstack/compute/contrib/flavorextradata.py (+1/-1) nova/api/openstack/compute/contrib/simple_tenant_usage.py (+7/-0) nova/compute/api.py (+2/-0) nova/db/sqlalchemy/api.py (+1/-1) nova/manager.py (+5/-0) nova/network/linux_net.py (+1/-0) nova/network/manager.py (+1/-2) nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py (+22/-6) nova/tests/fakelibvirt.py (+2/-0) nova/tests/network/test_manager.py (+35/-0) nova/tests/test_db_api.py (+2/-0) nova/tests/test_libvirt.py (+13/-1) nova/tests/test_linux_net.py (+1/-1) nova/utils.py (+11/-9) nova/version.py (+1/-1) nova/virt/disk/api.py (+1/-0) nova/virt/firewall.py (+14/-6) nova/virt/libvirt/connection.py (+24/-10) nova/virt/libvirt/volume.py (+5/-3) |
| To merge this branch: | bzr merge lp://qastaging/~yolanda.robla/ubuntu/precise/nova/essex-sru |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-12-18.
To post a comment you must log in.
Revision history for this message
| James Page (james-page) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Yolanda
The only problem I can see is with the changelog:
=== modified file 'debian/changelog'
--- debian/changelog 2012-12-17 10:39:28 +0000
+++ debian/changelog 2012-12-18 11:53:10 +0000
@@ -1,8 +1,7 @@
nova (2012.1.
[ Chuck Short ]
- * debian/*.logrotate: compress logfiles when they are rotated. (LP:
- #1049915)
+ * debian/*.logrotate: compress logfiles when they are rotated. (LP: #1049915)
[ Yolanda Robla Mota ]
* Resynchronize with stable/essex (9f277e38):
@@ -43,7 +42,7 @@
- [ae280ca] Deleted floating ips can cause instance delete to fail
(LP: #1038266)
- -- Adam Gandelman <email address hidden> Mon, 27 Aug 2012 14:50:40 -0700
+ -- Adam Gandelman <email address hidden> Mon, 27 Aug 2012 14:50:40 -0700
nova (2012.1.
The bug reference needs to be in a single line and Adam's email address has been truncated.
Fix that up and this branch looks good to go.