Merge ~gary-wzl77/snappy-hwe-snaps/+git/easy-openvpn:drop_changelog into ~snappy-hwe-team/snappy-hwe-snaps/+git/easy-openvpn:master

Proposed by Gary.Wang on 2017-10-12
Status: Merged
Approved by: Simon Fels on 2017-10-12
Approved revision: 5425a4efab0aeefe5e0a14bf17f39f3c96271783
Merged at revision: 05f5eebafebbdab8c7b6da571c0b48dbf7912c9a
Proposed branch: ~gary-wzl77/snappy-hwe-snaps/+git/easy-openvpn:drop_changelog
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/easy-openvpn:master
Diff against target: 16 lines (+3/-0)
1 file modified
snapcraft.yaml (+3/-0)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve on 2017-10-12
Simon Fels Approve on 2017-10-12
Konrad Zapałowicz (community) code 2017-10-12 Approve on 2017-10-12
Review via email: mp+332174@code.launchpad.net

Commit message

Get rid of ChangeLog file from the easyrsa to avoid the conflicts during snapping.

Description of the change

Get rid of ChangeLog file from the easyrsa to avoid the conflicts during snapping.

To post a comment you must log in.
review: Approve (code)
Simon Fels (morphis) wrote :

LGTM

review: Approve

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/716/

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/717/

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/718/

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/719/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index 4fe04c8..5654be8 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -83,8 +83,11 @@ parts:
6 easyrsa: usr/local/easyrsa/easyrsa
7 openssl-1.0.cnf: usr/local/easyrsa/openssl-1.0.cnf
8 x509-types: usr/local/easyrsa/x509-types
9+ stage:
10+ - -ChangeLog
11 prime:
12 - usr/local/easyrsa
13+ - -ChangeLog
14 scripts:
15 plugin: dump
16 source: .

Subscribers

People subscribed via source and target branches

to all changes: