Merge lp://qastaging/~zulcss/heat/heat-refresh-ubuntu-style into lp://qastaging/~openstack-ubuntu-testing/heat/havana
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~zulcss/heat/heat-refresh-ubuntu-style |
| Merge into: | lp://qastaging/~openstack-ubuntu-testing/heat/havana |
| Diff against target: |
990 lines (+174/-560) 31 files modified
debian/changelog (+33/-0) debian/control (+10/-12) debian/gbp.conf (+0/-9) debian/heat-api-cfn.config.in (+0/-15) debian/heat-api-cfn.postinst.in (+0/-20) debian/heat-api-cfn.templates (+0/-20) debian/heat-api-cfn.upstart (+17/-0) debian/heat-api-cloudwatch.config.in (+0/-14) debian/heat-api-cloudwatch.postinst.in (+0/-20) debian/heat-api-cloudwatch.templates (+0/-20) debian/heat-api-cloudwatch.upstart (+17/-0) debian/heat-api.config.in (+0/-16) debian/heat-api.postinst.in (+0/-25) debian/heat-api.templates (+0/-61) debian/heat-api.upstart (+17/-0) debian/heat-common.dirs (+2/-0) debian/heat-common.install (+3/-0) debian/heat-common.postinst.in (+0/-18) debian/heat-engine.config.in (+0/-14) debian/heat-engine.postinst.in (+0/-23) debian/heat-engine.templates (+0/-17) debian/heat-engine.upstart (+17/-0) debian/patches/fix-package-version-detection-when-building-doc.patch (+0/-27) debian/patches/removes-lxml-version-limitation-from-pip-requires.patch (+8/-8) debian/patches/series (+1/-1) debian/patches/ubuntu-configuration.patch (+47/-0) debian/po/POTFILES.in (+0/-4) debian/po/templates.pot (+0/-184) debian/pydist-overrides (+1/-0) debian/rules (+1/-30) debian/watch (+0/-2) |
| To merge this branch: | bzr merge lp://qastaging/~zulcss/heat/heat-refresh-ubuntu-style |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Openstack Ubuntu Testers | Pending | ||
|
Review via email:
|
|||
Description of the change
Ubuntu respin and updating for havana.
Unmerged revisions
- 8. By Chuck Short
-
debian/watch: Dropped.
- 7. By Chuck Short
-
debian/po/*: Dropped.
- 6. By Chuck Short
-
debian/gbp.conf: Dropped.
- 5. By Chuck Short
-
Add missing files
- 4. By Chuck Short
-
Add more missing files
- 3. By Chuck Short
-
Add missing patch
- 2. By Chuck Short
-
* New upstream release.
* debian/control, debian/rules: Dropped openstack-pkg-tools.
* debian/control:
- Dropped python-argparse
- Dropped python-qpid
- Added python-pbr
- Added python-d2to1
- Added python-six
- Dropped python-pycryptoppo
- Droped python-nose
- Added python-testtools
- Added testrepository
* debian/control: Dropped dbconfig-common.
* debian/pydist- overrides: Added python-argparse its apart of
python-2.7.
* debian/*.config.in: Dropped config.in files, we are not using them.
* debian/*.templates. in: Dropped templates.in files, we are not using them.
* Added upstart jobs.
* debian/patches/ ubuntu- configuration. patch: Fix configuration files
to use the kombu rpc_backend.
* debian/patches/ removes- lxml-version- limitation- from-pip- requires. patch:
Refreshed.
* debian/patches/ fix-package- version- detection- when-building- doc.patch:
Dropped no longer needed.
* debian/heat-common. install: Install api-paste.ini and policy.json.
