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
Status: Merged
Approved by: Simon Fels
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
Simon Fels Approve
Konrad Zapałowicz (community) code Approve
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.
Revision history for this message
Konrad Zapałowicz (kzapalowicz) :
review: Approve (code)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 5425a4efab0aeefe5e0a14bf17f39f3c96271783

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

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4fe04c8..5654be8 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -83,8 +83,11 @@ parts:
83 easyrsa: usr/local/easyrsa/easyrsa83 easyrsa: usr/local/easyrsa/easyrsa
84 openssl-1.0.cnf: usr/local/easyrsa/openssl-1.0.cnf84 openssl-1.0.cnf: usr/local/easyrsa/openssl-1.0.cnf
85 x509-types: usr/local/easyrsa/x509-types85 x509-types: usr/local/easyrsa/x509-types
86 stage:
87 - -ChangeLog
86 prime:88 prime:
87 - usr/local/easyrsa89 - usr/local/easyrsa
90 - -ChangeLog
88 scripts:91 scripts:
89 plugin: dump92 plugin: dump
90 source: .93 source: .

Subscribers

People subscribed via source and target branches

to all changes: