[08:05] <YoBoY> good morning
[11:27] <daker> yo
[11:27] <daker> mhall119, cjohnston i am going to merge this https://code.launchpad.net/~daker/loco-directory/pixie-plugin/+merge/55981
[11:27] <daker> Ronnie, ^
[11:34] <nigelb> daker: wait
[11:35] <nigelb> daker: have you seen my mail about tarmac?
[11:35] <nigelb> https://lists.ubuntu.com/archives/community-web-projects/2011-June/000023.html
[11:36] <nigelb> If you can, just use that :_)
[11:36] <nigelb> :-)
[11:40] <daker> i saw it
[11:40] <nigelb> Ideally, it should make our life easier.
[11:40] <daker> i don't know how to use it, do you have any docs ?
[11:40] <nigelb> well, my mail has all the docs you need.
[11:40] <daker> ok
[11:40] <nigelb> basically, tarmac is running on my server every 1 hour
[11:41] <nigelb> so, you can just set a commit message, set the Status as Approved, and it should be merged in.
[11:41] <nigelb> daker: ^ this needs to be done on MP in Launchpad.
[11:42] <daker> ah ok good
[11:42] <daker> let's try it
[11:42] <nigelb> Let me know when you've done both
[11:42] <nigelb> I'll trigger tarmac manually
[11:42] <nigelb> so you can see it right away :)
[11:45] <daker> nigelb, is it good https://code.launchpad.net/~daker/loco-directory/pixie-plugin/+merge/55981 ?
[11:46] <nigelb> daker: yup, looks good.  hang on. running tarmac
[11:47] <nigelb> daker: hrm, there were conflicts.
[11:47] <daker> :/
[11:47] <daker> where ?
[11:48] <nigelb> daker: loco_directory/templates/teams/team_detail.html
[11:48] <daker> ok wait i'll fix that
[11:50] <daker> nigelb, what should we do ?
[11:51] <nigelb> daker: basically you should make sure it doesn't conflict with trunk.
[11:52] <nigelb> daker: is your branch off a clean trunk?
[11:52] <daker> normally yes
[11:52] <daker> but mhall119 made changes on that file
[11:53]  * nigelb blames mhall119 for everything :p
[11:53] <daker> should i pull then fixe the conflicts ?
[11:53] <nigelb> daker: at this point, it looks too painful for you to do it with tarmac. Just do it normally :)
[11:54] <nigelb> I don't want to make your life hell :)
[11:54] <daker> ok
[11:56] <nigelb> I'll investigate how to fix this if it were to happen.
[12:35] <daker> has anyone used gunicorn with django before ?
[14:10] <mhall119> normally you can just bzr rebase the branch that's being proposed for merging, to get updates from trunk
[18:50] <daker> funny http://princessleia.com/journal/?p=4515 :D
[18:51] <pleia2> not funny, awesome! :)
[18:51] <daker> yes!!
[18:51] <nigelb> If my folks were using jewelery, I'd have definitely bought a pair :)
[18:56] <nigelb> mhall119: Hey, so if that happens again, do a bzr rebase, fix and upload again?
[18:56] <daker> oh ensemble rocks!!
[18:58] <cjohnston> everything blows up nigelb
[19:02] <mhall119> nigelb: pretty much, yeah
[19:02] <mhall119> daker: want to help make ensemble formulas for summit and loco-directory?
[19:07] <daker> oh good idea
[19:07] <daker> will try to do it
[19:10] <daker> mhall119, fil a bug https://bugs.launchpad.net/principia/+bug/795476
[19:10] <ubot4> Launchpad bug 795476 in principia "Formula needed: NFS (affects: 1) (heat: 6)" [Wishlist,New]
[19:10] <daker> oops https://bugs.launchpad.net/principia/
[23:40] <cjohnston> anyone got an issue with me preparing a release?
[23:41] <cjohnston> for LD