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
diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
index 1f8a8e9..1fbca20 100644
--- a/charm/launchpad-admin/charmcraft.yaml
+++ b/charm/launchpad-admin/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
35 after:35 after:
36 - ols-layers36 - ols-layers
37 source: https://git.launchpad.net/launchpad-layers37 source: https://git.launchpad.net/launchpad-layers
38 source-commit: "0311e05ec2e856e61a2620f68aa3ea35c0a3029b"38 source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
39 source-submodules: []39 source-submodules: []
40 source-type: git40 source-type: git
41 plugin: dump41 plugin: dump
diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index 47b8752..deb7add 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
35 after:35 after:
36 - ols-layers36 - ols-layers
37 source: https://git.launchpad.net/launchpad-layers37 source: https://git.launchpad.net/launchpad-layers
38 source-commit: "0311e05ec2e856e61a2620f68aa3ea35c0a3029b"38 source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
39 source-submodules: []39 source-submodules: []
40 source-type: git40 source-type: git
41 plugin: dump41 plugin: dump
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index cd51483..56666d4 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
35 after:35 after:
36 - ols-layers36 - ols-layers
37 source: https://git.launchpad.net/launchpad-layers37 source: https://git.launchpad.net/launchpad-layers
38 source-commit: "0311e05ec2e856e61a2620f68aa3ea35c0a3029b"38 source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
39 source-submodules: []39 source-submodules: []
40 source-type: git40 source-type: git
41 plugin: dump41 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: