Merge ~jadonn/ubuntu/+source/placement:master into ubuntu/+source/placement:ubuntu/devel
Proposed by
Jadon Naas
| Status: | Needs review |
|---|---|
| Proposed branch: | ~jadonn/ubuntu/+source/placement:master |
| Merge into: | ubuntu/+source/placement:ubuntu/devel |
| Diff against target: |
491 lines (+311/-1) (has conflicts) 14 files modified
.launchpad.yaml (+86/-0) .zuul.yaml (+10/-0) ChangeLog (+13/-0) PKG-INFO (+78/-0) debian/changelog (+9/-0) debian/patches/install-missing-db-files.patch (+7/-0) openstack_placement.egg-info/PKG-INFO (+78/-0) openstack_placement.egg-info/entry_points.txt (+4/-0) openstack_placement.egg-info/pbr.json (+5/-1) releasenotes/source/victoria.rst (+4/-0) releasenotes/source/wallaby.rst (+4/-0) releasenotes/source/xena.rst (+4/-0) releasenotes/source/yoga.rst (+4/-0) setup.cfg (+5/-0) Conflict in .zuul.yaml Conflict in ChangeLog Conflict in PKG-INFO Conflict in debian/changelog Conflict in debian/patches/install-missing-db-files.patch Conflict in openstack_placement.egg-info/PKG-INFO Conflict in openstack_placement.egg-info/entry_points.txt Conflict in openstack_placement.egg-info/pbr.json Conflict in releasenotes/source/victoria.rst Conflict in releasenotes/source/wallaby.rst Conflict in releasenotes/source/xena.rst Conflict in releasenotes/source/yoga.rst Conflict in setup.cfg |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Pending | ||
|
Review via email:
|
|||
Commit message
New release candidate for OpenStack Caracal
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
