[11:40] <Saviq> bregma, Trevinho, would you please resolve the logic (there is no code one AFAICT) conflict between what landed in unity8 and https://code.launchpad.net/~bregma/unity8/lp-1596069/+merge/298341 wrt MIR_SERVER and stuff
[11:41] <bregma> you mean, fight it out?
[11:42] <Saviq> yes :)
[14:33] <mterry> josharenson1, can you merge trunk into split greeter again?
[14:33] <josharenson1> mterry: sure, can we merge split greeter into trunk instead soon? :-p
[14:33] <mterry> josharenson1, :)  I assume next post-ota silo could include it
[14:45] <josharenson> mterry: done, for the sessions-model one too.. no conflicts :-D
[14:47] <mterry> josharenson, in sessions-model, a bad merge somewhere dropped the extra-long name for the "long-name" test user
[14:48] <josharenson> mterry: ugh, I hope I didn't miss anything else.. I'll take a look
[14:49] <Saviq> josharenson, mterry, yeah the next silo should have the split greeter indeed
[14:49] <josharenson> yay