Launchpad itself

Merge ~cjwatson/launchpad:charm-ftpmaster-sync-ols-layers into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-ftpmaster-sync-ols-layers
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 85b8ffdfa0afdfd0f75d452efe372a9a723624b7
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-ftpmaster-sync-ols-layers
Merge into: launchpad:master
Diff against target: 44 lines (+4/-4)
2 files modified
charm/launchpad-ftpmaster-publisher/charmcraft.yaml (+2/-2)
charm/launchpad-ftpmaster-uploader/charmcraft.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+449263@code.launchpad.net

Commit message

charm: Sync ftpmaster charm-wheels/ols-layers with other charms

Description of the change

Compare https://git.launchpad.net/launchpad/commit?id=1099f303dc. (The changes to `build-snaps`, `build-packages`, and `reactive-charm-build-arguments` from that commit already appear to be in place in these two charms as well.)

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) wrote :

Will do the same for the ppa charm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
2index 96c2906..b19fb51 100644
3--- a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
4+++ b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
5@@ -11,7 +11,7 @@ bases:
6 parts:
7 charm-wheels:
8 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
9- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
10+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
11 source-submodules: []
12 source-type: git
13 plugin: dump
14@@ -21,7 +21,7 @@ parts:
15 - "-charm-wheels"
16 ols-layers:
17 source: https://git.launchpad.net/ols-charm-deps
18- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
19+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
20 source-submodules: []
21 source-type: git
22 plugin: dump
23diff --git a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
24index 990f677..e2edb20 100644
25--- a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
26+++ b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
27@@ -11,7 +11,7 @@ bases:
28 parts:
29 charm-wheels:
30 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
31- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
32+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
33 source-submodules: []
34 source-type: git
35 plugin: dump
36@@ -21,7 +21,7 @@ parts:
37 - "-charm-wheels"
38 ols-layers:
39 source: https://git.launchpad.net/ols-charm-deps
40- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
41+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
42 source-submodules: []
43 source-type: git
44 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: