Merge lp://qastaging/~ubuntu-branches/ubuntu/precise/nova/precise-updates-201302220310 into lp://qastaging/ubuntu/precise-updates/nova
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/precise/nova/precise-updates-201302220310 |
| Merge into: | lp://qastaging/ubuntu/precise-updates/nova |
| Diff against target: |
15987 lines (+127/-15334) (has conflicts) 57 files modified
.pc/0001-fix-useexisting-deprecation-warnings.patch/nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py (+0/-97) .pc/0001-fix-useexisting-deprecation-warnings.patch/nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py (+0/-69) .pc/CVE-2013-0208.patch/nova/compute/api.py (+0/-1842) .pc/CVE-2013-0208.patch/nova/exception.py (+0/-1031) .pc/fix-docs-build-without-network.patch/doc/source/conf.py (+0/-234) .pc/fix-pep8-errors.patch/nova/api/openstack/compute/contrib/hosts.py (+0/-305) .pc/fix-pep8-errors.patch/nova/api/openstack/compute/contrib/networks.py (+0/-140) .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_admin_actions.py (+0/-278) .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_disk_config.py (+0/-253) .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py (+0/-98) .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_security_groups.py (+0/-1185) .pc/fix-pep8-errors.patch/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py (+0/-340) .pc/fix-pep8-errors.patch/nova/tests/test_libvirt_vif.py (+0/-175) .pc/fix-pep8-errors.patch/nova/virt/baremetal/nodes.py (+0/-42) .pc/fix-pep8-errors.patch/nova/virt/baremetal/proxy.py (+0/-794) .pc/fix-pep8-errors.patch/nova/virt/fake.py (+0/-343) .pc/fix-pep8-errors.patch/nova/virt/libvirt/connection.py (+0/-2541) .pc/fix-pep8-errors.patch/nova/virt/vmwareapi/vmops.py (+0/-825) .pc/fix-pep8-errors.patch/nova/virt/xenapi/volume_utils.py (+0/-413) .pc/fix-pep8-errors.patch/nova/virt/xenapi_conn.py (+0/-638) .pc/fix-pep8-errors.patch/nova/vnc/xvp_proxy.py (+0/-187) .pc/fix-pep8-errors.patch/tools/hacking.py (+0/-195) .pc/fix-pep8-errors.patch/tools/xenserver/vdi_chain_cleanup.py (+0/-128) .pc/fix-ubuntu-tests.patch/nova/tests/test_api.py (+0/-610) .pc/kombu_tests_timeout.patch/nova/tests/rpc/test_kombu.py (+0/-295) .pc/nova-manage_flagfile_location.patch/bin/nova-manage (+0/-1746) .pc/path-to-the-xenhost.conf-fixup.patch/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost (+0/-435) bin/nova-manage (+1/-1) debian/changelog (+14/-0) debian/patches/series (+4/-0) debian/patches/use_bare_container_format_by_default.patch (+45/-0) doc/source/conf.py (+1/-1) nova/api/openstack/compute/contrib/hosts.py (+1/-1) nova/api/openstack/compute/contrib/networks.py (+1/-1) nova/compute/api.py (+0/-16) nova/db/sqlalchemy/migrate_repo/versions/075_convert_bw_usage_to_store_network_id.py (+2/-2) nova/db/sqlalchemy/migrate_repo/versions/081_drop_instance_id_bw_cache.py (+1/-1) nova/exception.py (+0/-14) nova/tests/api/openstack/compute/contrib/test_admin_actions.py (+1/-1) nova/tests/api/openstack/compute/contrib/test_disk_config.py (+1/-1) nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py (+1/-1) nova/tests/api/openstack/compute/contrib/test_security_groups.py (+2/-2) nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py (+9/-9) nova/tests/rpc/test_kombu.py (+0/-1) nova/tests/test_api.py (+1/-1) nova/tests/test_libvirt_vif.py (+18/-18) nova/virt/baremetal/nodes.py (+1/-1) nova/virt/baremetal/proxy.py (+3/-3) nova/virt/fake.py (+3/-3) nova/virt/libvirt/connection.py (+4/-4) nova/virt/vmwareapi/vmops.py (+1/-1) nova/virt/xenapi/volume_utils.py (+1/-1) nova/virt/xenapi_conn.py (+3/-3) nova/vnc/xvp_proxy.py (+5/-5) plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost (+1/-1) tools/hacking.py (+1/-1) tools/xenserver/vdi_chain_cleanup.py (+1/-1) Contents conflict in .pc/applied-patches Text conflict in debian/changelog Text conflict in debian/patches/series |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/precise/nova/precise-updates-201302220310 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise-updates/nova reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/nova/precise-updates-201302220310. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 87. By Chuck Short
-
* debian/
patches/ use_bare_ container_ format_ by_default. patch:
- nova does not set container_format when snapshotting instance with ref image
deleted (LP: #1119248)
- nova-compute will now always set container_format to something valid since
Glance expects this when creating a new image
- patching from stable/essex - [75f6922] Use bare container format by default
