Colin Watson has proposed merging
~cjwatson/launchpad:charm-ftpmaster-sync-ols-layers into launchpad:master.
Commit message:
charm: Sync ftpmaster charm-wheels/ols-layers with other charms
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449263
Compare https://git.launchpad.net/launchpad/commit?id=1099f303dc. (The changes
to `build-snaps`, `build-packages`, and `reactive-charm-build-arguments` from
that commit already appear to be in place in these two charms as well.)
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:charm-ftpmaster-sync-ols-layers into launchpad:master.
diff --git a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
index 96c2906..b19fb51 100644
--- a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
+++ b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
parts:
charm-wheels:
source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
source-submodules: []
source-type: git
plugin: dump
@@ -21,7 +21,7 @@ parts:
- "-charm-wheels"
ols-layers:
source: https://git.launchpad.net/ols-charm-deps
- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
source-submodules: []
source-type: git
plugin: dump
diff --git a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
index 990f677..e2edb20 100644
--- a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
+++ b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
parts:
charm-wheels:
source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
source-submodules: []
source-type: git
plugin: dump
@@ -21,7 +21,7 @@ parts:
- "-charm-wheels"
ols-layers:
source: https://git.launchpad.net/ols-charm-deps
- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
source-submodules: []
source-type: git
plugin: dump
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
