Thanks, I pushed this to master.
On Tue, Dec 20, 2011 at 11:19:27AM -0800, Ethan Jackson wrote: > Looks good. > > Ethan > > On Tue, Dec 20, 2011 at 10:43, Ben Pfaff <b...@nicira.com> wrote: > > Requested-by: Hao Zheng <hzh...@nicira.com> > > --- > > ?vswitchd/vswitch.xml | ? 20 ++++++++++++++++++-- > > ?1 files changed, 18 insertions(+), 2 deletions(-) > > > > diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml > > index 84d91da..2f9a534 100644 > > --- a/vswitchd/vswitch.xml > > +++ b/vswitchd/vswitch.xml > > @@ -372,8 +372,20 @@ > > > > ? ? <group title="OpenFlow Configuration"> > > ? ? ? <column name="controller"> > > - ? ? ? ?OpenFlow controller set. ?If unset, then no OpenFlow controllers > > - ? ? ? ?will be used. > > + ? ? ? ?<p> > > + ? ? ? ? ?OpenFlow controller set. ?If unset, then no OpenFlow controllers > > + ? ? ? ? ?will be used. > > + ? ? ? ?</p> > > + > > + ? ? ? ?<p> > > + ? ? ? ? ?If there are primary controllers, removing all of them clears the > > + ? ? ? ? ?flow table. ?If there are no primary controllers, adding one also > > + ? ? ? ? ?clears the flow table. ?Other changes to the set of controllers, > > such > > + ? ? ? ? ?as adding or removing a service controller, adding another > > primary > > + ? ? ? ? ?controller to supplement an existing primary controller, or > > removing > > + ? ? ? ? ?only one of two primary controllers, have no effect on the flow > > + ? ? ? ? ?table. > > + ? ? ? ?</p> > > ? ? ? </column> > > > > ? ? ? <column name="fail_mode"> > > @@ -406,6 +418,10 @@ > > ? ? ? ? <p>When more than one controller is configured, > > ? ? ? ? <ref column="fail_mode"/> is considered only when none of the > > ? ? ? ? configured controllers can be contacted.</p> > > + ? ? ? ?<p> > > + ? ? ? ? ?Changing <ref column="fail_mode"/> when no primary controllers > > are > > + ? ? ? ? ?configured clears the flow table. > > + ? ? ? ?</p> > > ? ? ? </column> > > > > ? ? ? <column name="datapath_id"> > > -- > > 1.7.2.5 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
