Launchpad itself

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

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

Commit message

charm: Update ols-layers

Description of the change

This pulls in a number of fixes, especially to `interface-pgsql`.

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

Self-approving - this is a relatively simple bump, and I've tested it locally.

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 507bbe3..f1697bd 100644
3--- a/charm/launchpad-admin/charmcraft.yaml
4+++ b/charm/launchpad-admin/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: "fe523e25521254c2034eea96e2fde079034b593a"
10+ source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
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: "c2faacbd6d227b2ae40ee57ab162b28691e88ca6"
19+ source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
20 source-submodules: []
21 source-type: git
22 plugin: dump
23diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
24index 8b9bdda..4c31229 100644
25--- a/charm/launchpad-appserver/charmcraft.yaml
26+++ b/charm/launchpad-appserver/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: "fe523e25521254c2034eea96e2fde079034b593a"
32+ source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
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: "c2faacbd6d227b2ae40ee57ab162b28691e88ca6"
41+ source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
42 source-submodules: []
43 source-type: git
44 plugin: dump
45diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
46index 0060a18..0e7ce0a 100644
47--- a/charm/launchpad/charmcraft.yaml
48+++ b/charm/launchpad/charmcraft.yaml
49@@ -11,7 +11,7 @@ bases:
50 parts:
51 charm-wheels:
52 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
53- source-commit: "fe523e25521254c2034eea96e2fde079034b593a"
54+ source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
55 source-submodules: []
56 source-type: git
57 plugin: dump
58@@ -21,7 +21,7 @@ parts:
59 - "-charm-wheels"
60 ols-layers:
61 source: https://git.launchpad.net/ols-charm-deps
62- source-commit: "c2faacbd6d227b2ae40ee57ab162b28691e88ca6"
63+ source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
64 source-submodules: []
65 source-type: git
66 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: