Thanks, applied to master.
On Tue, Jul 22, 2014 at 04:11:42PM -0700, Justin Pettit wrote: > Acked-by: Justin Pettit <jpet...@nicira.com> > > > On Tue, Jul 22, 2014 at 4:09 PM, Ben Pfaff <b...@nicira.com> wrote: > > > We've had a couple of questions about this lately, including one suggestion > > that we should always save the OpenFlow port numbers. This explains why > > the behavior is as it is. > > > > Signed-off-by: Ben Pfaff <b...@nicira.com> > > --- > > utilities/ovs-ctl.in | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in > > index 170f39a..6d2e938 100755 > > --- a/utilities/ovs-ctl.in > > +++ b/utilities/ovs-ctl.in > > @@ -1,5 +1,5 @@ > > #! /bin/sh > > -# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. > > +# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. > > # > > # Licensed under the Apache License, Version 2.0 (the "License"); > > # you may not use this file except in compliance with the License. > > @@ -297,7 +297,10 @@ ovs_save () { > > } > > > > save_ofports_if_required () { > > - # Save ofports if we are upgrading from a pre-1.10 branch. > > + # Save OpenFlow port numbers if we are upgrading from a pre-1.10 > > branch. > > + # > > + # (Versions 1.10 and later save OpenFlow port numbers without > > assistance, > > + # so we don't have to do anything for them. > > case `ovs-appctl version | sed 1q` in > > "ovs-vswitchd (Open vSwitch) 1."[0-9].*) > > action "Saving ofport values" ovs_save save-ofports \ > > -- > > 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