Merge ~rafaeldtinoco/ubuntu/+source/pacemaker:lp1862947-focal into ubuntu/+source/pacemaker:ubuntu/focal-devel

Proposed by Rafael David Tinoco
Status: Merged
Merge reported by: Rafael David Tinoco
Merged at revision: f8101a1d4410142f61b4d5a10a9d0f4878a4bceb
Proposed branch: ~rafaeldtinoco/ubuntu/+source/pacemaker:lp1862947-focal
Merge into: ubuntu/+source/pacemaker:ubuntu/focal-devel
Diff against target: 35 lines (+8/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server Pending
Review via email: mp+378958@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Since merge 378957 is gone lets continue here.
This LGTM now.

Style suggestion, prepend the CL entry with "d/control:" if you like it before upload.

review: Approve
Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

Perfect. Adjusted changelog, pushed it:

$ git push pkg upload/2.0.1-5ubuntu4
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 8 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.05 KiB | 179.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/pacemaker
 * [new tag] upload/2.0.1-5ubuntu4 -> upload/2.0.1-5ubuntu4

and uploaded it:

$ dput ubuntu pacemaker_2.0.1-5ubuntu4_source.changes
Checking signature on .changes
gpg: /home/rafaeldtinoco/work/sources/ubuntu/pacemaker_2.0.1-5ubuntu4_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: /home/rafaeldtinoco/work/sources/ubuntu/pacemaker_2.0.1-5ubuntu4.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading pacemaker_2.0.1-5ubuntu4.dsc: done.
  Uploading pacemaker_2.0.1-5ubuntu4.debian.tar.xz: done.
  Uploading pacemaker_2.0.1-5ubuntu4_source.buildinfo: done.
  Uploading pacemaker_2.0.1-5ubuntu4_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 468c6a7..6901b02 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+pacemaker (2.0.1-5ubuntu4) focal; urgency=medium
7+
8+ * Make crmsh the default management tool for now (LP: #1862947)
9+
10+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Wed, 12 Feb 2020 14:36:27 +0000
11+
12 pacemaker (2.0.1-5ubuntu3) focal; urgency=medium
13
14 * No-change rebuild with fixed binutils on arm64.
15diff --git a/debian/control b/debian/control
16index 4488557..095d142 100644
17--- a/debian/control
18+++ b/debian/control
19@@ -100,6 +100,7 @@ Pre-Depends:
20 ${misc:Pre-Depends},
21 Depends:
22 corosync (>= 1.99),
23+ crmsh,
24 dbus,
25 # the init script sources /lib/lsb/init-functions:
26 lsb-base (>= 3.0-6),
27@@ -113,7 +114,7 @@ Recommends:
28 Suggests:
29 # the fence_legacy helper uses /usr/sbin/stonith from cluster-glue:
30 cluster-glue,
31- crmsh | pcs,
32+ pcs,
33 fence-agents,
34 Breaks:
35 pacemaker-remote,

Subscribers

People subscribed via source and target branches