"dev" <[email protected]> wrote on 08/06/2016 07:18:29 AM:
> From: nickcooper-zhangtonghao <[email protected]> > To: [email protected] > Cc: nickcooper-zhangtonghao <[email protected]> > Date: 08/06/2016 07:18 AM > Subject: [ovs-dev] [PATCH] ovn-controller: Remove the repeated code. > Sent by: "dev" <[email protected]> > > Signed-off-by: nickcooper-zhangtonghao <nickcooper- > [email protected]> > --- > ovn/controller/lflow.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c > index fda10eb..e22923b 100644 > --- a/ovn/controller/lflow.c > +++ b/ovn/controller/lflow.c > @@ -595,7 +595,6 @@ consider_logical_flow(const struct lport_index *lports, > } > ofctrl_add_flow(ptable, lflow->priority, &m->match, &conj, > &lflow->header_.uuid); > - ofpbuf_uninit(&conj); > ofpbuf_uninit(&conj); > } > } git blame shows what happened with this one - I didn't resolve one of the merge conflicts between fdbdb595 and a53d69c9 correctly Double checked it with 25 cycles of ovn unit tests running with -j4 and it looks fine, so... Acked-by: Ryan Moats <[email protected]> _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
