| wallyworld | externalreality_: juju/charm tests failed | 00:35 |
|---|---|---|
| wallyworld | externalreality_: also, you ned to land the juju/charm change, pull tip of master locally, and then do the dep updates in the bundledata PR and push | 00:36 |
| wallyworld | you can't do the dependencies.tsv updates until the other repo pr has landed | 00:36 |
| wallyworld | iianm | 00:37 |
| * babbageclunk goes for a run in the horrible cold weather | 01:01 | |
| menn0 | externalreality_: any chance I could get a quick summary of what you've been working on? (email if possible) | 01:45 |
| menn0 | wallyworld: those 2 weekly status emails you sent are about the same thing right? | 01:51 |
| wallyworld | menn0: oh, i didn't realise both got sent - the first one had a typo | 01:51 |
| menn0 | wallyworld: no worries | 01:52 |
| menn0 | axw, babbageclunk, or wallyworld: https://github.com/juju/juju/pull/7679 | 01:58 |
| wallyworld | ok | 01:59 |
| wallyworld | menn0: what a stupid bug, lgtm | 02:00 |
| menn0 | wallyworld: thanks | 02:00 |
| === menn0 is now known as menn0-afk | ||
| axw | babbageclunk: oops, I pulled the trigger on https://github.com/juju/1.25-upgrade/pull/5 too soon | 02:29 |
| axw | babbageclunk: ignore that review, it was meant for just one commit | 02:29 |
| babbageclunk | axw: ok, holding fire. | 02:30 |
| axw | babbageclunk: https://github.com/juju/1.25-upgrade/pull/5/commits/d936c14a4504ca3463f95037659b950c7c0be7a1 makes me think we should keep any changes to the trees separately. code is probably too inflexible to support that though | 02:32 |
| babbageclunk | axw: yeah, I was thinking something similar - it's going to be a pain if we need to update juju2 again after 2.2.3 comes out. | 02:33 |
| babbageclunk | axw: Could keep those changes as a set of patches that get applied when building? | 02:33 |
| babbageclunk | axw: nasty though - works ok in CI where we're throwing away working trees each time. | 02:34 |
| axw | babbageclunk: yeah, I think it'll be a PITA to work that way | 02:35 |
| axw | not sure yet | 02:35 |
| axw | babbageclunk: ok I think you're good to merge | 02:36 |
| babbageclunk | To be honest it wasn't *too much work* to unpick them - I think if we keep changes to juju2 in separate commits from changes to the other parts it might be ok. | 02:36 |
| babbageclunk | axw: but yeah, a better way would be good. | 02:37 |
| babbageclunk | axw: awesome, thanks. | 02:37 |
| axw | babbageclunk: ok. we're not going to have as huge a change between 2.2.2 and 2.2.3 anyway | 02:37 |
| babbageclunk | axw: true | 02:37 |
| babbageclunk | axw: actually, I don't think there's a merge-bot on that repo and I don't have commit privs. Do you? | 02:37 |
| axw | babbageclunk: nope | 02:38 |
| axw | and no thumper in sight | 02:38 |
| babbageclunk | he's on a swap day | 02:38 |
| axw | wallyworld: do you have special powers over https://github.com/juju/1.25-upgrade? can you merge? | 02:39 |
| wallyworld | i'll try | 02:39 |
| wallyworld | which pr? | 02:39 |
| babbageclunk | yeah, I was just going to hassle wallyworld too | 02:39 |
| babbageclunk | start with #1 please - I think I'll need to rebase each one. | 02:39 |
| babbageclunk | wallyworld: ^ | 02:40 |
| wallyworld | yep, on it | 02:40 |
| babbageclunk | wallyworld: I don't think there's a mergebot. | 02:47 |
| wallyworld | babbageclunk: done, next one has conflict | 03:19 |
| babbageclunk | yeah, unsurprising - I'll need to do some rebasing for some of them | 03:20 |
| anastasiamac | can someone plz stamp a straighforward move of resources cmd? https://github.com/juju/juju/pull/7680 | 03:31 |
| anastasiamac | purely mechanical :D | 03:32 |
| === menn0-afk is now known as menn0 | ||
| wallyworld | anastasiamac: lgtm | 03:45 |
| anastasiamac | wallyworld: menn0: \o/ i've missed one little refactoring thing... but thank you for reviews :D | 03:45 |
| wallyworld | axw: here's a PR against the upstream branch yet to land, it add the api/apiserver layers for the relation status watcher https://github.com/wallyworld/juju/pull/40 | 03:45 |
| axw | wallyworld: ok. prob won't get to it until after lunch | 03:46 |
| wallyworld | axw: no worries, i still need to land the first one. i'll keep going on the 3rd one | 03:46 |
| babbageclunk | wallyworld: can you please land the other upgrade PRs in order now? I've rebased them all, so I think they should go one after the other. https://github.com/juju/1.25-upgrade/pulls | 04:06 |
| wallyworld | ok, just for you | 04:07 |
| babbageclunk | wallyworld: thanks! Whoa, that "now" sounds really demanding where it is, I actually meant "I've rebased them now". | 04:07 |
| wallyworld | nah, all good :-) | 04:08 |
| wallyworld | if you had said, "get me a beer, now" | 04:08 |
| wallyworld | that would have been different | 04:08 |
| wallyworld | anyway, all landed | 04:08 |
| babbageclunk | wallyworld: awesome! Get yourself a beer, now. | 04:09 |
| babbageclunk | Hmm, maybe a bit early. | 04:09 |
| wallyworld | soon, soon | 04:09 |
| axw | wallyworld: I've added another commit to https://github.com/juju/juju/pull/7676, which does the storage counts. can you PTAL? | 04:51 |
| wallyworld | sure | 04:52 |
| wallyworld | axw: looks great, thanks for updating | 04:59 |
| menn0 | wallyworld, babbageclunk: could you pls do a quick review of the summary email I just sent you guys | 05:01 |
| babbageclunk | menn0: sure | 05:01 |
| wallyworld | menn0: looks great. we can save local resources in bundles till next week when it lands | 05:02 |
| babbageclunk | menn0: oops, replied to the email instead. | 05:05 |
| menn0 | wallyworld: i'm happy to include local resources if that's close | 05:08 |
| wallyworld | it is | 05:08 |
| wallyworld | should land tomorrow hopefully | 05:08 |
| menn0 | wallyworld: can you send me 2 sentences on it? | 05:08 |
| wallyworld | ok | 05:09 |
| menn0 | babbageclunk: good call on the ordering | 05:10 |
| menn0 | wallyworld: when you said "revision number" did you mean "charm URL"? | 05:17 |
| menn0 | wallyworld: never mind | 05:18 |
| menn0 | i'm dumb | 05:18 |
| wallyworld | no :-) | 05:18 |
| menn0 | wallyworld, babbageclunk: thanks guys. sent. | 05:22 |
| wallyworld | ty | 05:22 |
| babbageclunk | menn0: nice one | 05:22 |
| axw | I reviewed your PR if you didn't notice | 05:23 |
| axw | wallyworld: ^ | 05:25 |
| wallyworld | axw: oh great ty | 05:25 |
| wallyworld | axw: yeah, there was already a RelationStatus. I couldn't think of a name, but just now "RelationStatusValue" popped into my head | 05:27 |
| axw | wallyworld: that's certainly better, thanks | 05:27 |
| wallyworld | axw: changes pushed | 05:29 |
| axw | wallyworld: and approved | 05:30 |
| wallyworld | \o/ | 05:30 |
| === frankban|afk is now known as frankban | ||
| anastasiamac | axw: here is the PR - https://github.com/juju/juju/pull/7682 whenever u get a chance | 06:29 |
| axw | anastasiamac: LGTM | 06:30 |
| anastasiamac | axw: \o/ | 06:31 |
| wallyworld | axw: if you get a chance later, here's a small(ish) PR stacked on the previous one to wire up the workers to complete the functionality. just waiting on me menno to look at the first state watcher pr and i'll land together after that https://github.com/wallyworld/juju/pull/41 | 07:24 |
| wallyworld | there's no hurry | 07:25 |
| axw | wallyworld: looks good but I'm going to take another pass on monday, my brain is just about cooked | 07:35 |
| wallyworld | axw: no worries, have a good weekend | 07:46 |
| === frankban is now known as frankban|afk | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!