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: 342d90dc009f1a20c24c7c5a9a215a285a947ec6
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: 182 lines (+14/-14)
14 files modified
charm/launchpad-admin/charmcraft.yaml (+1/-1)
charm/launchpad-appserver/charmcraft.yaml (+1/-1)
charm/launchpad-assets/charmcraft.yaml (+1/-1)
charm/launchpad-buildd-manager/charmcraft.yaml (+1/-1)
charm/launchpad-copy-archive-publisher/charmcraft.yaml (+1/-1)
charm/launchpad-debian-importer/charmcraft.yaml (+1/-1)
charm/launchpad-ftpmaster-publisher/charmcraft.yaml (+1/-1)
charm/launchpad-ftpmaster-uploader/charmcraft.yaml (+1/-1)
charm/launchpad-librarian/charmcraft.yaml (+1/-1)
charm/launchpad-ppa-publisher/charmcraft.yaml (+1/-1)
charm/launchpad-ppa-uploader/charmcraft.yaml (+1/-1)
charm/launchpad-scripts-bzrsyncd/charmcraft.yaml (+1/-1)
charm/launchpad-scripts/charmcraft.yaml (+1/-1)
charm/launchpad/charmcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+449949@code.launchpad.net

Commit message

charm: Update launchpad-layers to 6ca1d670f6

Description of the change

This pulls in "Clear flags more carefully on upgrade-charm" (see https://code.launchpad.net/~cjwatson/launchpad-layers/+git/launchpad-layers/+merge/449849).

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) :
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 2851717..afb3e49 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: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
10+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
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 babfe2e..63cbe4d 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: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
23+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
24 source-submodules: []
25 source-type: git
26 plugin: dump
27diff --git a/charm/launchpad-assets/charmcraft.yaml b/charm/launchpad-assets/charmcraft.yaml
28index 2a53f26..40bc39d 100644
29--- a/charm/launchpad-assets/charmcraft.yaml
30+++ b/charm/launchpad-assets/charmcraft.yaml
31@@ -35,7 +35,7 @@ parts:
32 after:
33 - ols-layers
34 source: https://git.launchpad.net/launchpad-layers
35- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
36+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
37 source-submodules: []
38 source-type: git
39 plugin: dump
40diff --git a/charm/launchpad-buildd-manager/charmcraft.yaml b/charm/launchpad-buildd-manager/charmcraft.yaml
41index 2851717..afb3e49 100644
42--- a/charm/launchpad-buildd-manager/charmcraft.yaml
43+++ b/charm/launchpad-buildd-manager/charmcraft.yaml
44@@ -35,7 +35,7 @@ parts:
45 after:
46 - ols-layers
47 source: https://git.launchpad.net/launchpad-layers
48- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
49+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
50 source-submodules: []
51 source-type: git
52 plugin: dump
53diff --git a/charm/launchpad-copy-archive-publisher/charmcraft.yaml b/charm/launchpad-copy-archive-publisher/charmcraft.yaml
54index 96c2906..4939bf9 100644
55--- a/charm/launchpad-copy-archive-publisher/charmcraft.yaml
56+++ b/charm/launchpad-copy-archive-publisher/charmcraft.yaml
57@@ -35,7 +35,7 @@ parts:
58 after:
59 - ols-layers
60 source: https://git.launchpad.net/launchpad-layers
61- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
62+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
63 source-submodules: []
64 source-type: git
65 plugin: dump
66diff --git a/charm/launchpad-debian-importer/charmcraft.yaml b/charm/launchpad-debian-importer/charmcraft.yaml
67index 2851717..afb3e49 100644
68--- a/charm/launchpad-debian-importer/charmcraft.yaml
69+++ b/charm/launchpad-debian-importer/charmcraft.yaml
70@@ -35,7 +35,7 @@ parts:
71 after:
72 - ols-layers
73 source: https://git.launchpad.net/launchpad-layers
74- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
75+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
76 source-submodules: []
77 source-type: git
78 plugin: dump
79diff --git a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
80index 4b3e648..be010a1 100644
81--- a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
82+++ b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
83@@ -35,7 +35,7 @@ parts:
84 after:
85 - ols-layers
86 source: https://git.launchpad.net/launchpad-layers
87- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
88+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
89 source-submodules: []
90 source-type: git
91 plugin: dump
92diff --git a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
93index e2edb20..7d5cf6a 100644
94--- a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
95+++ b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
96@@ -35,7 +35,7 @@ parts:
97 after:
98 - ols-layers
99 source: https://git.launchpad.net/launchpad-layers
100- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
101+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
102 source-submodules: []
103 source-type: git
104 plugin: dump
105diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml
106index 3544b5d..f0f55fc 100644
107--- a/charm/launchpad-librarian/charmcraft.yaml
108+++ b/charm/launchpad-librarian/charmcraft.yaml
109@@ -35,7 +35,7 @@ parts:
110 after:
111 - ols-layers
112 source: https://git.launchpad.net/launchpad-layers
113- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
114+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
115 source-submodules: []
116 source-type: git
117 plugin: dump
118diff --git a/charm/launchpad-ppa-publisher/charmcraft.yaml b/charm/launchpad-ppa-publisher/charmcraft.yaml
119index 0922035..187e366 100644
120--- a/charm/launchpad-ppa-publisher/charmcraft.yaml
121+++ b/charm/launchpad-ppa-publisher/charmcraft.yaml
122@@ -35,7 +35,7 @@ parts:
123 after:
124 - ols-layers
125 source: https://git.launchpad.net/launchpad-layers
126- source-commit: "77ce25b8fcc87ca18cad7fd80cc6639b9a5ea589"
127+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
128 source-submodules: []
129 source-type: git
130 plugin: dump
131diff --git a/charm/launchpad-ppa-uploader/charmcraft.yaml b/charm/launchpad-ppa-uploader/charmcraft.yaml
132index 0460205..a872ea2 100644
133--- a/charm/launchpad-ppa-uploader/charmcraft.yaml
134+++ b/charm/launchpad-ppa-uploader/charmcraft.yaml
135@@ -35,7 +35,7 @@ parts:
136 after:
137 - ols-layers
138 source: https://git.launchpad.net/launchpad-layers
139- source-commit: "77ce25b8fcc87ca18cad7fd80cc6639b9a5ea589"
140+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
141 source-submodules: []
142 source-type: git
143 plugin: dump
144diff --git a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
145index 2851717..afb3e49 100644
146--- a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
147+++ b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
148@@ -35,7 +35,7 @@ parts:
149 after:
150 - ols-layers
151 source: https://git.launchpad.net/launchpad-layers
152- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
153+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
154 source-submodules: []
155 source-type: git
156 plugin: dump
157diff --git a/charm/launchpad-scripts/charmcraft.yaml b/charm/launchpad-scripts/charmcraft.yaml
158index 2851717..afb3e49 100644
159--- a/charm/launchpad-scripts/charmcraft.yaml
160+++ b/charm/launchpad-scripts/charmcraft.yaml
161@@ -35,7 +35,7 @@ parts:
162 after:
163 - ols-layers
164 source: https://git.launchpad.net/launchpad-layers
165- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
166+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
167 source-submodules: []
168 source-type: git
169 plugin: dump
170diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
171index 0834f5f..7fa28f1 100644
172--- a/charm/launchpad/charmcraft.yaml
173+++ b/charm/launchpad/charmcraft.yaml
174@@ -35,7 +35,7 @@ parts:
175 after:
176 - ols-layers
177 source: https://git.launchpad.net/launchpad-layers
178- source-commit: "8b7d25a29b8297d491abe6a0c6b69f34e39dddba"
179+ source-commit: "6ca1d670f636e1abb8328d88fc5fda80cb75152a"
180 source-submodules: []
181 source-type: git
182 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: