2010/4/5 Stefan Berger <stefanb@xxxxxxxxxx>: > > Daniel Veillard <veillard@xxxxxxxxxx> wrote on 04/05/2010 11:32:47 AM: > > >> > > >> > > >> > >> >> > >> libvir-list-bounces@xxxxxxxxxx >> > >> >> > >> --- >> > >> src/conf/nwfilter_conf.c | 120 ++++++------- >> > >> src/conf/nwfilter_conf.h | 16 +- >> > >> src/conf/nwfilter_params.c | 2 +- >> > >> src/nwfilter/nwfilter_driver.c | 25 ++-- >> > >> src/nwfilter/nwfilter_ebiptables_driver.c | 285 ++++++++++ >> > >> +------------------ >> > >> src/nwfilter/nwfilter_gentech_driver.c | 39 ++-- >> > >> src/nwfilter/nwfilter_gentech_driver.h | 3 +- >> > >> tests/nwfilterxml2xmltest.c | 2 +- >> > >> 8 files changed, 202 insertions(+), 290 deletions(-) >> > >> >> > > >> > >> > Sure, no problem. Go ahead with your patch, I'll rebase/change mine as >> > necessary. >> >> Agreed, please push it. > > Done. > > Stefan Your patch completely includes mine (I noticed this while rebasing), so my patch is not necessary anymore. Matthias -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list