Merge lp://qastaging/~zulcss/heat/ubuntu-refresh into lp://qastaging/~openstack-ubuntu-testing/heat/havana
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~zulcss/heat/ubuntu-refresh |
| Merge into: | lp://qastaging/~openstack-ubuntu-testing/heat/havana |
| Diff against target: |
1274 lines (+192/-744) 43 files modified
debian/changelog (+46/-1) debian/control (+12/-12) debian/gbp.conf (+0/-9) debian/heat-api-cfn.config.in (+0/-15) debian/heat-api-cfn.init (+0/-87) debian/heat-api-cfn.install (+1/-2) debian/heat-api-cfn.manpages (+0/-1) debian/heat-api-cfn.postinst.in (+0/-20) debian/heat-api-cfn.templates (+0/-20) debian/heat-api-cfn.upstart (+11/-0) debian/heat-api-cloudwatch.config.in (+0/-14) debian/heat-api-cloudwatch.init (+0/-87) debian/heat-api-cloudwatch.install (+1/-2) debian/heat-api-cloudwatch.manpages (+0/-1) debian/heat-api-cloudwatch.postinst.in (+0/-20) debian/heat-api-cloudwatch.templates (+0/-20) debian/heat-api-cloudwatch.upstart (+11/-0) debian/heat-api.config.in (+0/-16) debian/heat-api.init (+0/-87) debian/heat-api.install (+0/-1) debian/heat-api.manpages (+0/-1) debian/heat-api.postinst.in (+0/-25) debian/heat-api.templates (+0/-61) debian/heat-api.upstart (+11/-0) debian/heat-common.dirs (+3/-0) debian/heat-common.install (+7/-0) debian/heat-common.manpages (+0/-1) debian/heat-common.postinst (+22/-0) debian/heat-common.postinst.in (+0/-18) debian/heat-engine.config.in (+0/-14) debian/heat-engine.init (+0/-87) debian/heat-engine.install (+1/-1) debian/heat-engine.manpages (+0/-1) debian/heat-engine.postinst.in (+0/-23) debian/heat-engine.templates (+0/-17) debian/heat-engine.upstart (+11/-0) debian/patches/fix-package-version-detection-when-building-doc.patch (+0/-27) debian/patches/fix-ubuntu-configuration.patch (+47/-0) debian/patches/removes-lxml-version-limitation-from-pip-requires.patch (+0/-18) debian/patches/series (+1/-2) debian/pydist-overrides (+1/-0) debian/rules (+3/-32) debian/watch (+3/-1) |
| To merge this branch: | bzr merge lp://qastaging/~zulcss/heat/ubuntu-refresh |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Openstack Ubuntu Testers | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 24. By Chuck Short
-
Fix manpages one more time
- 23. By Chuck Short
-
debian/*.manpages: Install the correct manpages
- 22. By Chuck Short
-
debian/*.manpages: Install the right manpages.
- 21. By Chuck Short
-
debian/*.install: Install the configration files into the right places.
- 20. By Chuck Short
-
debian/
heat-common. install: Add missing files. - 19. By Chuck Short
-
debian/
removes- lxml-version- limitation- from-pip- requires. patch: Dropped no
longer needed. - 18. By Chuck Short
-
debian/
heat-common. postinst: Add common configration stuff. - 17. By Chuck Short
-
heat-engine}
.postinst. in: Dropped not used in Ubuntu.
* debian/{heat-api- cfn, heat-api- cloudwatch, heat-api, - 16. By Chuck Short
-
- Dropped openstack-pkg configuration.
- Run testr init and testr run by hand. - 15. By Chuck Short
-
* debian/rules:
- Dropped sed of configuration files.
* debian/watch: Update to point to launchpad source
* debian/pydist- overrides: Override python-argparse
* debian/patches/ fix-ubuntu- configuration. patch: Update configruation files
to use kombu rpc backend.
* debian/patches/ fix-package- version- detection- when-building- doc.patch: Dropped
no longer needed.
