[06:19] goooooood morning [06:36] helllo === TheMue_ is now known as TheMue [07:58] TheMue, davecheney: mornin' [07:59] rogpeppe: heya [08:00] yay, I has internets again, I hope [08:00] mornings :) [08:09] fwereade: internet makes stupid (topic of a German TV show yesterday) [08:27] just rebooting [09:22] yo. [09:34] Aram: hiya [09:41] Aram: hi [09:42] Aram: jfi, i'm working on mstate/unit [10:24] lunchtime [12:14] niemeyer: yo [12:14] ! [12:16] wrtp: Buenas! [12:16] niemeyer: do you know of any way of doing an "unmerge"? [12:17] niemeyer: i.e. i've got a branch that merged another one some time ago, and i want to back out from all the changes that that merge introduced [12:18] wrtp: The only reasonable path for that is to apply a reversed diff [12:18] wrtp: It's not free of side effects, unfortunately [12:19] niemeyer: thanks. [12:19] wrtp: The old branch won't merge properly anymore, so it'll need to be recreated by branching and applying the forward diff again [12:19] niemeyer: i'll probably just build the branch from scratch again. [12:32] lunch [12:37] wrtp: Enjoy [12:45] pwd [12:57] :) [13:18] Aram: after unit, as said, i'm now starting with relation units (first step w/o presence and watcher) [13:45] I have a scheduled visit to the doctor.. back soon [14:20] TheMue, Aram: a fairly small cleanup of the juju.Conn interface: https://codereview.appspot.com/6488077 [14:20] niemeyer: ^ [14:28] wrtp: you've got a review [14:28] TheMue: thanks [14:28] wrtp: yw [14:29] TheMue: about that comment - you're probably right, but i think i'll leave it be for the time being, as it's an unrelated change. [14:30] ok [14:54] * niemeyer waves [15:16] niemeyer: hiya [16:07] wrtp: Review sent [16:07] niemeyer: ooh you're a lovely man [16:07] Lunch time, biab [16:07] wrtp: :-) [16:36] so, sports is calling, cu tomorrow [16:57] * niemeyer is back [16:57] and heading to a meeting [16:57] I suppose [17:30] niemeyer: is that CL LGTY with the suggested change? [17:31] wrtp: Yeah, it does look reasonable [17:31] niemeyer: thanks [17:32] niemeyer: done. will submit. [17:33] wrtp: Thanks! [17:33] niemeyer: good to get one more dependency out of the way! [17:33] wrtp: Yeah, feels good doesn't it :) [17:33] wrtp: Progress! [17:33] niemeyer: yeah. [17:33] niemeyer: upgrade-juju is done; just writing the tests. [17:34] niemeyer: i have an idea for the provisioner agent stuff - i'll see if it works out. [17:34] wrtp: Woohay [17:34] niemeyer: if i'm right (and you think it's ok) it could save lots of time and code. we'll see. [17:35] wrtp: Sweet [17:35] wrtp: I'm just finishing the presence stuff with docs and whatnot [17:37] niemeyer: right, that's me for the day. good to finish with a submit... [17:37] wrtp: +1 [17:37] niemeyer: have a good rest-of-day! [17:37] wrtp: Have a good evening [17:38] wrtp: thanks! [17:38] niemeyer: will do [23:32] heads up, while i'm waiting on a few things stabalise I'm doing juju ssh [23:33] i'll do scp at the same time as it is very similar [23:34] davecheney: Cheers [23:36] niemeyer: could you have a read of the email I sent to you and Aram yesterday about mstate.Open/Dial [23:37] when you have a chance [23:37] davecheney: It does support TLS [23:38] davecheney: But I think we can chew one thing at a time [23:38] davecheney: We'll have to define a new protocol to establish the connection [23:45] niemeyer: this is mainly for juju.Conn, what will replace the current UseSSH flag on state.Info ? [23:45] I guess I can do UseTLS and the define mstate.Dial/DialTLS [23:45] davecheney: I think we should make mstate work entirely before we shift that over [23:45] davecheney: Because otherwise we'll have new issues [23:45] of course [23:46] i'm not trying to put the cart before the horse [23:46] davecheney: How to validate the certificate, how to provide the initial password, etc [23:46] yeeesh [23:46] all that :( [23:46] so, do you want mongo tunneled over ssh ? [23:47] davecheney: UseSSH should at least so we can take the blocker out of everybody's plate [23:47] understood [23:47] davecheney: Yeah, same thing we're doing now with ZooKeeper [23:47] davecheney: After we get everything else working, we can fix that [23:47] sounds like a good plan to me [23:48] i'm all booked for lisbo, gonna get there on time this time :) [23:48] lisbon [23:49] davecheney: That's great to hear. We'll have a good time there [23:50] I'll get some dinner and bbiab [23:59] niemeyer: we have unit.AssignedMachineId() [23:59] would I be able to add [23:59] (or replace it with) [23:59] unit.AssignedMachine [23:59] as most of the other machine related methods on unit take a *Machine, not an id