Pushed to master and branch-2.2.
On 1 May 2014 09:59, Ethan Jackson <et...@nicira.com> wrote:
> Acked-by: Ethan Jackson <et...@nicira.com>
>
>
> On Wed, Apr 30, 2014 at 2:57 PM, Joe Stringer <joestrin...@nicira.com>
> wrote:
> > This configuration option was shifted in 2.0, then removed in 2.1.
> > Remove the misleading log message.
> >
> > Signed-off-by: Joe Stringer <joestrin...@nicira.com>
> > ---
> > vswitchd/bridge.c | 7 -------
> > 1 file changed, 7 deletions(-)
> >
> > diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
> > index 84e9ab8..12852b4 100644
> > --- a/vswitchd/bridge.c
> > +++ b/vswitchd/bridge.c
> > @@ -626,13 +626,6 @@ bridge_reconfigure(const struct ovsrec_open_vswitch
> *ovs_cfg)
> > bridge_configure_stp(br);
> > bridge_configure_tables(br);
> > bridge_configure_dp_desc(br);
> > -
> > - if (smap_get(&br->cfg->other_config,
> "flow-eviction-threshold")) {
> > - /* XXX: Remove this warning message eventually. */
> > - VLOG_WARN_ONCE("As of June 2013, flow-eviction-threshold
> has been"
> > - " moved to the Open_vSwitch table. Ignoring
> its"
> > - " setting in the bridge table.");
> > - }
> > }
> > free(managers);
> >
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
