Merge ~cjwatson/launchpad:charm-update-launchpad-layers into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 5535d23e4d1077392e8ebf133d07b590449a5062
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-update-launchpad-layers
Merge into: launchpad:master
Diff against target: 39 lines (+3/-3)
3 files modified
charm/launchpad-admin/charmcraft.yaml (+1/-1)
charm/launchpad-appserver/charmcraft.yaml (+1/-1)
charm/launchpad/charmcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+441567@code.launchpad.net

Commit message

charm: Update launchpad-layers to 81c2d5b77d

Description of the change

This pulls in "Add trailing slash to supermirror_root".

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Trivial layers bump.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
2index 1f8a8e9..1fbca20 100644
3--- a/charm/launchpad-admin/charmcraft.yaml
4+++ b/charm/launchpad-admin/charmcraft.yaml
5@@ -35,7 +35,7 @@ parts:
6 after:
7 - ols-layers
8 source: https://git.launchpad.net/launchpad-layers
9- source-commit: "0311e05ec2e856e61a2620f68aa3ea35c0a3029b"
10+ source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
11 source-submodules: []
12 source-type: git
13 plugin: dump
14diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
15index 47b8752..deb7add 100644
16--- a/charm/launchpad-appserver/charmcraft.yaml
17+++ b/charm/launchpad-appserver/charmcraft.yaml
18@@ -35,7 +35,7 @@ parts:
19 after:
20 - ols-layers
21 source: https://git.launchpad.net/launchpad-layers
22- source-commit: "0311e05ec2e856e61a2620f68aa3ea35c0a3029b"
23+ source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
24 source-submodules: []
25 source-type: git
26 plugin: dump
27diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
28index cd51483..56666d4 100644
29--- a/charm/launchpad/charmcraft.yaml
30+++ b/charm/launchpad/charmcraft.yaml
31@@ -35,7 +35,7 @@ parts:
32 after:
33 - ols-layers
34 source: https://git.launchpad.net/launchpad-layers
35- source-commit: "0311e05ec2e856e61a2620f68aa3ea35c0a3029b"
36+ source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
37 source-submodules: []
38 source-type: git
39 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: