snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-dnsmasq-cve into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager
  3. fix-dnsmasq-cve
  4. Merge into snap-20
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 94b99be5373f087871bf8a2a96541727dc876160
Merged at revision: caafb1dd8a6259fffc3beff876975f1ecf3adbaf
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-dnsmasq-cve
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20
Diff against target: 13 lines (+1/-1)
1 file modified
snap/snapcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+396987@code.launchpad.net

Commit message

Follow focal-updates branch for dnsmasq

A new dnsmasq package has been released and the new sources branch
applied/ubuntu/focal-updates has been created. Use it so we get latest
changes (check-versions helped to discover this).

Description of the change

Follow focal-updates branch for dnsmasq

A new dnsmasq package has been released and the new sources branch
applied/ubuntu/focal-updates has been created. Use it so we get latest
changes (check-versions helped to discover this).

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:94b99be5373f087871bf8a2a96541727dc876160
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/565/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/598
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/598
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/598
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/598
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1384
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1126
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1178/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/565/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 35c66a0..13a82da 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -111,7 +111,7 @@ parts:
6 plugin: make
7 source: https://git.launchpad.net/ubuntu/+source/dnsmasq
8 source-type: git
9- source-branch: applied/ubuntu/focal
10+ source-branch: applied/ubuntu/focal-updates
11 build-packages:
12 - build-essential
13 make-parameters:

Subscribers

People subscribed via source and target branches