lp:~soren/nova/essex-stable-catchup
- Get this branch:
- bzr branch lp:~soren/nova/essex-stable-catchup
Branch merges
- Ubuntu Server Developers: Pending requested
-
Diff: 31 lines (+8/-8)2 files modifieddebian/changelog (+8/-0)
debian/patches/series (+0/-8)
- Soren Hansen (community): Disapprove
-
Diff: 5406 lines (+3604/-748) (has conflicts)126 files modifieddebian/README.xcp_and_openstack (+243/-0)
debian/api-paste.ini (+0/-114)
debian/changelog (+544/-1)
debian/control (+253/-20)
debian/copyright (+10/-7)
debian/debian_control_vars (+0/-3)
debian/gbp.conf (+6/-0)
debian/mans/nova-api-ec2.8 (+20/-0)
debian/mans/nova-api-metadata.8 (+20/-0)
debian/mans/nova-api-os-compute.8 (+20/-0)
debian/mans/nova-api-os-volume.8 (+20/-0)
debian/mans/nova-cert.8 (+20/-0)
debian/mans/nova-console.8 (+20/-0)
debian/mans/nova-consoleauth.8 (+20/-0)
debian/mans/nova-rootwrap.8 (+20/-0)
debian/nova-ajax-console-proxy.init (+0/-73)
debian/nova-ajax-console-proxy.install (+0/-1)
debian/nova-ajax-console-proxy.logrotate (+0/-4)
debian/nova-ajax-console-proxy.manpages (+0/-1)
debian/nova-ajax-console-proxy.upstart.in (+0/-18)
debian/nova-api-ec2.init (+76/-0)
debian/nova-api-ec2.install (+1/-0)
debian/nova-api-ec2.logrotate (+4/-0)
debian/nova-api-ec2.manpages (+1/-0)
debian/nova-api-ec2.upstart.in (+18/-0)
debian/nova-api-metadata.init (+76/-0)
debian/nova-api-metadata.install (+1/-0)
debian/nova-api-metadata.logrotate (+4/-0)
debian/nova-api-metadata.manpages (+1/-0)
debian/nova-api-metadata.upstart.in (+18/-0)
debian/nova-api-os-compute.init (+76/-0)
debian/nova-api-os-compute.install (+1/-0)
debian/nova-api-os-compute.logrotate (+4/-0)
debian/nova-api-os-compute.manpages (+1/-0)
debian/nova-api-os-compute.upstart.in (+18/-0)
debian/nova-api-os-volume.init (+76/-0)
debian/nova-api-os-volume.install (+1/-0)
debian/nova-api-os-volume.logrotate (+4/-0)
debian/nova-api-os-volume.manpages (+1/-0)
debian/nova-api-os-volume.upstart.in (+18/-0)
debian/nova-api.init (+77/-56)
debian/nova-api.install (+0/-1)
debian/nova-api.upstart.in (+1/-1)
debian/nova-cert.init (+71/-0)
debian/nova-cert.install (+1/-0)
debian/nova-cert.logrotate (+4/-0)
debian/nova-cert.manpages (+1/-0)
debian/nova-cert.upstart.in (+18/-0)
debian/nova-common.install (+4/-0)
debian/nova-common.manpages (+2/-0)
debian/nova-common.manpages.in (+0/-1)
debian/nova-common.nova-manage.logrotate (+4/-0)
debian/nova-common.postinst (+42/-6)
debian/nova-compute-kvm.postinst (+8/-0)
debian/nova-compute-lxc.postinst (+8/-0)
debian/nova-compute-qemu.conf (+1/-0)
debian/nova-compute-qemu.postinst (+8/-0)
debian/nova-compute-uml.postinst (+8/-0)
debian/nova-compute-xen.postinst (+8/-0)
debian/nova-compute.init (+78/-53)
debian/nova-compute.pyinstall (+1/-0)
debian/nova-compute.upstart.in (+1/-1)
debian/nova-console.init (+97/-0)
debian/nova-console.install (+1/-0)
debian/nova-console.logrotate (+5/-0)
debian/nova-console.manpages (+1/-0)
debian/nova-console.upstart.in (+19/-0)
debian/nova-consoleauth.init (+97/-0)
debian/nova-consoleauth.install (+1/-0)
debian/nova-consoleauth.logrotate (+5/-0)
debian/nova-consoleauth.manpages (+1/-0)
debian/nova-consoleauth.upstart.in (+19/-0)
debian/nova-doc.docs (+1/-1)
debian/nova-doc.links (+7/-0)
debian/nova-network.init (+77/-51)
debian/nova-network.nova-dhcpbridge.logrotate (+4/-0)
debian/nova-network.pyinstall (+1/-0)
debian/nova-network.upstart.in (+1/-1)
debian/nova-objectstore.init (+77/-51)
debian/nova-objectstore.logrotate (+1/-5)
debian/nova-objectstore.upstart.in (+1/-1)
debian/nova-scheduler.init (+76/-50)
debian/nova-scheduler.upstart.in (+1/-1)
debian/nova-vncproxy.install (+1/-1)
debian/nova-vncproxy.upstart.in (+1/-1)
debian/nova-volume.default (+2/-3)
debian/nova-volume.init (+91/-59)
debian/nova-volume.pyinstall (+1/-0)
debian/nova-volume.upstart.in (+4/-1)
debian/nova-xcp-network.init (+167/-0)
debian/nova-xcp-network.install (+6/-0)
debian/nova-xcp-plugins.docs (+1/-0)
debian/nova-xcp-plugins.install (+6/-0)
debian/nova-xcp-plugins.postinst (+13/-0)
debian/nova-xcp-plugins.postrm (+11/-0)
debian/nova-xvpvncproxy.init (+97/-0)
debian/nova-xvpvncproxy.install (+1/-0)
debian/nova-xvpvncproxy.logrotate (+4/-0)
debian/nova.conf (+5/-2)
debian/nova_sudoers (+3/-48)
debian/patches/0001-fix-useexisting-deprecation-warnings.patch (+52/-0)
debian/patches/backport-lxc-container-console-fix.patch (+0/-43)
debian/patches/fix-docs-build-without-network.patch (+15/-0)
debian/patches/fix-ubuntu-tests.patch (+15/-0)
debian/patches/kombu_tests_timeout.patch (+11/-0)
debian/patches/nova-console-monitor.patch (+138/-0)
debian/patches/nova-manage_flagfile_location.patch (+8/-9)
debian/patches/packaged-ajaxterm-calls.patch (+0/-19)
debian/patches/path-to-the-xenhost.conf-fixup.patch (+12/-0)
debian/patches/series (+10/-0)
debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch (+51/-0)
debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch (+69/-0)
debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch (+155/-0)
debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch (+73/-0)
debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch (+53/-0)
debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch (+31/-0)
debian/pydist-overrides (+2/-0)
debian/python-nova.install (+0/-1)
debian/python-nova.postinst (+0/-12)
debian/python-nova.pyremove (+3/-0)
debian/pyversions (+0/-1)
debian/rules (+34/-22)
debian/source_nova.py (+1/-1)
debian/ubuntu_control_vars (+0/-2)
debian/watch (+1/-1)
debian/xen-openvswitch-nova.rules (+1/-0)
Branch information
Recent revisions
- 370. By Soren Hansen
-
* Snapshot of upstream stable/essex branch.
* Remove local copies of upstream patch set as upstream is nice
enough to publish tarballs with everything included. - 368. By Chuck Short
-
- b1d11b8 Use project_id in ec2.cloud.
_format_ image()
- 6e988ed Fixes image publication using deprecated auth. (LP: #977765) - 366. By Chuck Short
-
* debian/rules: Properly create empty doc/build/man dir for builds that
skip doc building
* debian/control: Set 'Conflicts: nova-compute-hypervisor' for the various
nova-compute- $type packages. (LP: #975616)
* debian/control: Set 'Breaks: nova-api' for the various nova-api-$service
sub-packages. (LP: #966115)
* Resynchronize with stable/essex:
- Fixes image publication using deprecated auth. (LP: #977765)
- 6e988ed Populate image properties with project_id again
- 3b14c74 Fixed bug 962840, added a test case.
- d4e96fe Allow unprivileged RADOS users to access rbd volumes.
- 4acfab6 Stop libvirt test from deleting instances dir
- 155c7b2 fix bug where nova ignores glance host in imageref
* debian/nova.conf: Enabled ec2_private_dns_show_ ip so that juju can
connect to openstack instances.
* debian/patches/ fix-docs- build-without- network. patch: Fix docs build
when there is no network access. - 363. By Chuck Short
-
* debian/
patches/ nova-console- monitor. patch: Disabled.
* debian/nova.conf: Removed console-monitor- patch
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)