Log file Viewer

[01:01:26] <tchaypo> Nakato: thanks for https://review.openstack.org/#/c/226088/

[04:44:10] <ErikRose> dstufft: jezdez: Alright. Finished `pip hash` and pushed it. Docs are all polished. Review at will!

[06:33:03] <jezdez> ErikRose: nicely done, I'll look later today

[17:26:09] <dstufft> ErikRose|afk: you have merge conflicts

[17:26:24] <ErikRose|afk> 'Tis true. Want me to merge develop in?

[17:26:45] <dstufft> ErikRose|afk: sure, or rebase, wahtever makes you feel happier about yourself :D

[17:26:57] <ErikRose|afk> Great. Rebase bothers me, so I'll merge develop. :-)

[17:27:23] <dstufft> I do some hella rebasing

[17:27:29] <dstufft> I edit history like a time lord

[17:27:32] <ErikRose|afk> hehe

[17:27:41] <ErikRose|afk> I don't do it much once branches get long.

[17:27:55] <ErikRose|afk> If I screw up resolving the conflicts and don't notice till much later, I'm hosed.

[17:29:45] <dstufft> ErikRose|afk: lmk once you merge it in and I'll do a review then too

[17:29:56] <ErikRose|afk> Maybe an hour or two

[17:30:13] <ErikRose|afk> Thanks!

[17:35:16] <ErikRose|afk> Hmm, the conflicts don't look too bad at all.

[17:41:12] <ErikRose|afk> Looks good. Pushing the merge.

[17:42:08] <ErikRose> dstufft: Okay, review away!