Merge ~lucaskanashiro/ubuntu/+source/corosync:merge-impish into ubuntu/+source/corosync:debian/sid

Proposed by Lucas Kanashiro
Status: Approved
Approved by: Lucas Kanashiro
Approved revision: faff2be86447d24a3c6518aca77d2b77a4bf91e4
Proposed branch: ~lucaskanashiro/ubuntu/+source/corosync:merge-impish
Merge into: ubuntu/+source/corosync:debian/sid
Diff against target: 368 lines (+240/-9)
7 files modified
debian/changelog (+197/-0)
debian/control (+5/-2)
debian/patches/Make-the-example-config-valid.patch (+13/-5)
debian/patches/lp1918735/0001-allow_knet_handle_fallback_default_yes.patch (+22/-0)
debian/patches/series (+1/-0)
debian/tests/control (+1/-1)
debian/tests/quorumtool (+1/-1)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
git-ubuntu developers Pending
Review via email: mp+406171@code.staging.launchpad.net

Description of the change

Merge version 3.1.2-2 from Debian. This version will allow us to drop a couple of patches because they were applied upstream.

PPA with the proposed changes:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/ha-stack/+packages

autopkgtest is still happy:

autopkgtest [16:47:56]: @@@@@@@@@@@@@@@@@@@@ summary
cfgtool PASS
quorumtool PASS

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [-] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [?] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [-] verified PPA package installs/uninstalls
  - [√] autopkgtest against the PPA package passes
  - [-] sanity checks test fine

Looks pretty straightforward, +1. I also verified the autopkgtest pass for me locally as well.

Offhand, the remaining ubuntu-delta sounds like it might be acceptable to Debian, has it been forwarded to them yet?

review: Approve
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Thanks for the review Bryce! The last part of the delta I added (to use uname to define the default node name) I submitted to Debian but no replies so far:

https://salsa.debian.org/ha-team/corosync/-/merge_requests/4

I'll rebase my branch there and try to reach out the Debian maintainer.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Package uploaded:

$ git push pkg upload/3.1.2-2ubuntu1
Enumerating objects: 51, done.
Counting objects: 100% (51/51), done.
Delta compression using up to 32 threads
Compressing objects: 100% (41/41), done.
Writing objects: 100% (41/41), 7.61 KiB | 1.52 MiB/s, done.
Total 41 (delta 28), reused 1 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/corosync
 * [new tag] upload/3.1.2-2ubuntu1 -> upload/3.1.2-2ubuntu1
$ dput ubuntu ../corosync_3.1.2-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../corosync_3.1.2-2ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../corosync_3.1.2-2ubuntu1.dsc: Valid signature from F823A2729883C97C
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading corosync_3.1.2-2ubuntu1.dsc: done.
  Uploading corosync_3.1.2.orig.tar.gz: done.
  Uploading corosync_3.1.2.orig.tar.gz.asc: done.
  Uploading corosync_3.1.2-2ubuntu1.debian.tar.xz: done.
  Uploading corosync_3.1.2-2ubuntu1_source.changes: done.
Successfully uploaded packages.

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches