[07:19] <hpidcock> https://github.com/juju/juju/pull/10469 review plz when anyone gets a chance
[08:22] <stickupkid> achilleasa, i'll back port my two branches now :|
[08:24] <achilleasa> stickupkid: there will be some conflicts; if you take a look at my branch I think I have resolved them but we should probably land my PR first before back-porting. Happy to help with the back-port
[08:25] <stickupkid> achilleasa, sure, sounds like a plan
[08:26] <stickupkid> achilleasa, tbh, let's land your branch now, i'm more than happy with the changes
[08:27] <achilleasa> stickupkid: ok, kicking a merge then
[08:29] <stickupkid> achilleasa, nice nice
[09:32] <achilleasa> stickupkid: PR has landed
[09:34] <stickupkid> achilleasa, nice, back-porting now
[09:51] <stickupkid> achilleasa, backported https://github.com/juju/juju/pull/10408
[10:08] <stickupkid> achilleasa, i'm not getting saas output when exporting a bundle, i think something broke with the overlay stuff, just checking now
[10:08] <achilleasa> stickupkid: I think you also need to copy the saas block here: https://github.com/juju/juju/pull/10470/files#diff-905f1f60f15de7466edf26def355c180R328
[10:09] <achilleasa> (probably explains what you are seeing)
[10:09] <stickupkid> spotted it
[10:10] <achilleasa> so the way it works is BundleData -> bundleOutput -> yaml (IIRC there is a comment that this is done to drop some things from the output)
[10:10] <stickupkid> yeah, found it at the same time
[10:10] <stickupkid> nice
[10:16] <achilleasa> stickupkid: any idea why this empty? https://github.com/juju/juju/pull/10470/commits/58e3869c9a0e3a11bd602b8ca781a2339c77bb4b I got the same when I was cherry-picking but I am pretty sure I had to resolve a conflict there
[10:16] <stickupkid> achilleasa, it's because they've already been back ported :|
[10:16] <stickupkid> achilleasa, but we need the commits to prevent any other conflicts etc
[10:17] <achilleasa> stickupkid: thought so but just wanted to double-check
[10:17] <stickupkid> achilleasa, me too, i went and investigated
[10:17] <stickupkid> hah
[10:17] <stickupkid> a
[10:18] <achilleasa> stickupkid: I will just do a quick QA and approve (although it should work as I have already tested the cherry-picked version)
[10:18] <stickupkid> achilleasa, yeah, better safe tbh
[19:38] <pmatulis> ahoy mateys
[19:38] <pmatulis> is there a special reason why `offer` does not support the `-m` option? would be more consistent