Launchpad itself

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

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-update-launchpad-layers
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 79dd97c0bb107614096a05588dfc8f053b1ffd79
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+440598@code.launchpad.net

Commit message

charm: Update launchpad-layers to 22811c726a

Description of the change

This pulls in "Set private_port for the xmlrpc_private vhost".

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

The effective change is a trivial one-line addition to a configuration file (https://code.launchpad.net/~cjwatson/launchpad-layers/+git/launchpad-layers/+merge/440550).

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 9d6d318..2ce2b19 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: "1920a6f823d8d882a99662bdda55f67f37359850"
10+ source-commit: "22811c726aca173d72ca94f83b35790474847106"
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 b35779b..304863a 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: "1920a6f823d8d882a99662bdda55f67f37359850"
23+ source-commit: "22811c726aca173d72ca94f83b35790474847106"
24 source-submodules: []
25 source-type: git
26 plugin: dump
27diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
28index 34e0ad5..54c5b16 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: "1920a6f823d8d882a99662bdda55f67f37359850"
36+ source-commit: "22811c726aca173d72ca94f83b35790474847106"
37 source-submodules: []
38 source-type: git
39 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: