in case you don't know, use the Resubmit proposal link
<sodre> ahhh
<sodre> I really need to get used to lp
<wallyworld__> it's good once you know all the features
<sodre> sorry, where is the resubmit
<wallyworld__> top right
<sodre> on the bug page ?
<wallyworld__> no, the mp page
<sodre> got it.
<sodre> so no prereq.
<wallyworld__> yep
<wallyworld__> that's better
<wallyworld__> except the json line is still there
<sodre> argh.
<sodre> how do I see that ?
<wallyworld__> look t the preview diff
<sodre> okay okay...
<wallyworld__> on the mp page
<wallyworld__> i'd say you added it to get stuff working
<sodre> I can take it out.
<wallyworld__> sodre: normally it would be ok to leave in, but because someone else is supposed to have a fix in progress, it's best not to overlap
<sodre> I am the one assigned the json bug
<wallyworld__> oh?
<sodre> yeah, sinzui set it to me.
<wallyworld__> ok. it was discussed yesterday that someone in our team would start on it. but since you have the bug, go for it
<wallyworld__> link the bug to your branch
<wallyworld__> so now you have 2 bugs linked
<sodre> I had a branch just for that bug
<sodre> it is already linked.
<sodre> maybe the best would be to approve/merge that first.
<sodre> then merge the radosgw-acl
<wallyworld__> sure. that's the more "correct" way
<wallyworld__> although for one line... :-)
<sodre> i know
<sodre> okay... let me just link the entire branch to both bugs.
<wallyworld__> since you have the branch, propose it and i'lllook
<wallyworld__> argh. whatever works :-)
<sodre> alright its proposed and linked to the bug
<wallyworld__> sodre: i've approved, thanks. next step is to set the commit message (usually copy the description) and mark as approved. then the landing bot will take over
<sodre> okay. is that in the Merge Proposal page as well ?
<sodre> cool
<wallyworld__> yep
<wallyworld__> sodre: update the descption to reference both bugs also :-)
<sodre> is it just a matter of writing #XXXX ?
<sodre> or is there a special markup ?
<wallyworld__> If you write