Ubuntu
masakari package

Merge ~jadonn/ubuntu/+source/masakari:master into ubuntu/+source/masakari:ubuntu/devel

  1. Git
  2. lp:~jadonn/ubuntu/+source/masakari
  3. master
  4. Merge into ubuntu/devel
Proposed by Jadon Naas
Status: Needs review
Proposed branch: ~jadonn/ubuntu/+source/masakari:master
Merge into: ubuntu/+source/masakari:ubuntu/devel
Diff against target: 522 lines (+377/-1) (has conflicts)
12 files modified
.launchpad.yaml (+86/-0)
AUTHORS (+4/-0)
ChangeLog (+8/-0)
PKG-INFO (+121/-0)
debian/changelog (+9/-0)
debian/patches/install-missing-db-files.patch (+7/-0)
debian/patches/series (+3/-0)
masakari.egg-info/PKG-INFO (+121/-0)
masakari.egg-info/entry_points.txt (+4/-0)
masakari.egg-info/pbr.json (+5/-1)
masakari/tests/unit/test_hacking.py (+4/-0)
setup.cfg (+5/-0)
Conflict in AUTHORS
Conflict in ChangeLog
Conflict in PKG-INFO
Conflict in debian/changelog
Conflict in debian/patches/install-missing-db-files.patch
Conflict in debian/patches/series
Conflict in masakari.egg-info/PKG-INFO
Conflict in masakari.egg-info/entry_points.txt
Conflict in masakari.egg-info/pbr.json
Conflict in masakari/tests/unit/test_hacking.py
Conflict in setup.cfg
Reviewer Review Type Date Requested Status
James Page Pending
Review via email: mp+462818@code.qastaging.launchpad.net

Commit message

New release candidate for OpenStack Caracal

Description of the change

The branch includes the changes from upstream for the OpenStack Caracal release candidate. The change does include removing the patch d/p/py312-compat.patch because upstream has incorporated changes that make the patch unnecessary.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches