Merge lp://staging/~openstack-ubuntu-testing/glance/debian-merge into lp://staging/~openstack-ubuntu-testing/glance/precise-essex-proposed
Proposed by
Chuck Short
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~openstack-ubuntu-testing/glance/debian-merge |
| Merge into: | lp://staging/~openstack-ubuntu-testing/glance/precise-essex-proposed |
| Diff against target: |
817 lines (+549/-43) 33 files modified
debian/changelog (+21/-0) debian/control (+7/-3) debian/copyright (+2/-2) debian/gbp.conf (+6/-0) debian/glance-api.glance-api.upstart (+0/-9) debian/glance-api.init (+90/-0) debian/glance-api.logrotate (+4/-2) debian/glance-api.manpages (+1/-0) debian/glance-api.upstart.in (+9/-0) debian/glance-common.config (+23/-0) debian/glance-common.postinst (+2/-0) debian/glance-common.templates (+29/-0) debian/glance-registry.config (+20/-0) debian/glance-registry.glance-registry.upstart (+0/-9) debian/glance-registry.init (+90/-0) debian/glance-registry.logrotate (+4/-2) debian/glance-registry.postinst (+63/-4) debian/glance-registry.prerm (+3/-7) debian/glance-registry.templates (+14/-0) debian/glance-registry.upstart.in (+9/-0) debian/mans/glance-api.8 (+19/-0) debian/mans/glance-control.8 (+19/-0) debian/mans/glance-manage.8 (+19/-0) debian/mans/glance-registry.8 (+19/-0) debian/mans/glance-upload.8 (+19/-0) debian/mans/glance.1 (+19/-0) debian/patches/default_conf.patch (+20/-0) debian/patches/series (+1/-0) debian/po/POTFILES.in (+1/-0) debian/pycompat (+0/-1) debian/python-glance-doc.links (+4/-0) debian/rules (+9/-3) debian/watch (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~openstack-ubuntu-testing/glance/debian-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Openstack Ubuntu Testers | Pending | ||
|
Review via email:
|
|||
Description of the change
Debian merges+debconf fixes.
To post a comment you must log in.
Revision history for this message
| Adam Gandelman (gandelman-a) wrote | # |
Unmerged revisions
- 126. By Chuck Short
-
* debian/
glance- common. config: Don't ask debconf questions.
by default.
* debian/glance- registry. conf: Don't ask debconf questions
by default. - 125. By Chuck Short
-
Add missing patch
- 124. By Chuck Short
-
Re-add upstart jobs
- 123. By Chuck Short
-
debian/rules: Handle init scripts properly due to the debian/ubuntu
merge. - 122. By Chuck Short
-
Add missing files
- 121. By Chuck Short
-
* Merge Ubuntu/Debian changes:
- debian/control: Update build depends.
- debian/mans/*: Add man pages.
- debian/{glance- api,glance- registry} .init: Update
init scripts.
- debian/pycompat: Dropped
- debian/rules: Update clean rules
- debian/copyright: Update copyright file.
- Make /var/log/glance and /etc/glance 0750 instead of 0700.
- Add dbconfig-support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Chuck-
debian/