[00:38] jujugui: Review please! https://codereview.appspot.com/16940043 [00:40] On it [00:52] bac: https://codereview.appspot.com/16950043 !!!!!!!! [00:52] benji: finally [01:09] benji: i approved it a while ago but forgot to ping you [01:09] bac: ok, looking now [04:51] hatch: ping [04:51] yo [04:56] rick_h_: The Face of JS at Canonical [04:56] Makyo: sssh [04:56] Hahah, sorry :) [04:56] Makyo: look, it's a playground, leave me alone :P [04:56] Hahaa [04:56] rofl [04:56] hatch: said the same exact thing 60s ago [04:56] it's my first time doing an org, don't konw wtf I'm doing :P [04:57] haha [04:57] maybe you shouldn't be championing this :P [04:57] it's doooomed! [04:58] Pff, it's fine. [04:58] haha [04:58] anyway, as you guys can see. Added you to some space to play with testing things. Gathering info, links, hints/tips [04:59] please feel free to submit additional information [04:59] yeah - we gota figure out how to keep the commit history clean [04:59] and start to pull together the full checklist/etc and we should probably talk about this in #cloud-dev [04:59] I'm not really sure the best approach for that [04:59] so that's the end of the conversation for in here :) [05:01] sounds like a plan [05:04] rick_h_, so I'm trying to rebase jc's PR but it looks like he merged in master a few times [05:04] any idea how to do this? [05:05] right, that's what I mean. It gets messy. So you should create a new branch from master, cherry pick his commits [05:05] you can do is rebase the ones in a row down to one so you can narrow the number of cherry picks required [05:06] hatch: I *think* you can rebase the merges or something, but have to try it out [05:06] yeah I'm not having any luck, I'll keep at er [05:07] let me know if you want me to pull down and try it out [05:15] rick_h_, ok if you'd like :) I'm at a loss https://github.com/jaycee/ghost-charm it's the add-mysql branch [05:16] hatch: so you want to just rebase it? [05:16] yeah so his PR is 16 commits [05:16] I'd like it down to logical commits [05:17] or just 1 [05:17] but whenever I try it's like it thinks it's already been rebased [05:18] I'm sure I'm just missing something - it's been quite a while since I've had to do this [05:18] yea, working on it sec [05:24] hatch: what do you want the message squashed down to? [05:24] adding db-relation-changed and departed hooks for mysql [05:24] that pretty much sums it up [05:25] id' be very interested to know the commands you used to do that too [05:26] yea, sec [05:29] bah, what a mess [05:30] right? haha [05:33] well I rebased a bit too far :) [05:34] oh, actually it might be good [05:35] :) So these are the types of things we will have to figure out how to avoid [05:38] https://github.com/mitechie/ghost-charm/tree/add-mysql [05:39] so I've got it cleaned up, I tried to then merge in trunk but have conflicts to handle [05:41] hatch: http://paste.mitechie.com/show/1053/ is what I went through [05:41] hatch: so each of my commits is resolving rebase conflict issue steps [05:42] that might even be able to be shortened but seemed ok atm [05:42] anyway, getting late. [05:45] cool thanks I'll give this a go [05:45] gnt [16:14] luca__: http://10.155.45.150:8888/ [21:05] jujugui looking for a review https://codereview.appspot.com/17340043/ [21:54] hatch, lp:~ya-bo-ng/juju-gui/onboarding-continued [23:22] bac: Could you please review https://code.launchpad.net/~abentley/charmworld/remove-018-migration/+merge/192749 [23:26] abentley: done [23:26] bac: Thanks! [23:37] bac, revno 231 is now deployed. [23:37] to staging.