Thanks Ben, Justin. I just pushed the changes to master. thanx! mehak
On Fri, Mar 23, 2012 at 11:20 PM, Justin Pettit <jpet...@nicira.com> wrote: > On Mar 23, 2012, at 6:32 PM, Ben Pfaff <b...@nicira.com> wrote: > > > On Fri, Mar 23, 2012 at 06:12:00PM -0700, Mehak Mahajan wrote: > >> Ethan's change caused a merge conflict for bridge.c .. I have made some > >> more incremental changes to the existing patch. > >> Does it look good? > > > > Yes, that's what I'd expect. > > By the way, when Mehak and I were resolving the conflicts, we found that > Ethan's IDL changes caused a somewhat subtle issue. The "vswitch-idl.{c|h}" > files were sticking around in the "vswitchd" directory, which has a higher > preference than the new "lib" directory. Since the location is different, a > "make clean" won't delete the old files. If you're doing builds, you may > want to clean out those files in "vswitchd". > > --Justin > > >
_______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev