Thanks! Applied to master.
On Tue, Nov 25, 2014 at 12:35:12PM -0800, Jarno Rajahalme wrote: > Acked-by: Jarno Rajahalme <jrajaha...@nicira.com> > > On Nov 5, 2014, at 8:35 AM, Ben Pfaff <b...@nicira.com> wrote: > > > Reported-by: Martin Vizvary <vizv...@ics.muni.cz> > > Signed-off-by: Ben Pfaff <b...@nicira.com> > > --- > > AUTHORS | 1 + > > vswitchd/vswitch.xml | 18 ++++++++++++++---- > > 2 files changed, 15 insertions(+), 4 deletions(-) > > > > diff --git a/AUTHORS b/AUTHORS > > index 1354703..2906708 100644 > > --- a/AUTHORS > > +++ b/AUTHORS > > @@ -257,6 +257,7 @@ Logan Rosen logatron...@gmail.com > > Luca Falavigna dktrkr...@debian.org > > Luiz Henrique Ozaki luiz.oz...@gmail.com > > Marco d'Itri m...@linux.it > > +Martin Vizvary vizv...@ics.muni.cz > > Maxime Brun m.b...@alphalink.fr > > Michael A. Collins mike.a.coll...@ark-net.org > > Michael Hu m...@nicira.com > > diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml > > index 0d78847..d02e5ff 100644 > > --- a/vswitchd/vswitch.xml > > +++ b/vswitchd/vswitch.xml > > @@ -3974,10 +3974,20 @@ > > </column> > > > > <column name="active_timeout"> > > - The interval at which NetFlow records are sent for flows that are > > - still active, in seconds. A value of <code>0</code> requests the > > - default timeout (currently 600 seconds); a value of <code>-1</code> > > - disables active timeouts. > > + <p> > > + The interval at which NetFlow records are sent for flows that > > + are still active, in seconds. A value of <code>0</code> > > + requests the default timeout (currently 600 seconds); a value > > + of <code>-1</code> disables active timeouts. > > + </p> > > + > > + <p> > > + The NetFlow passive timeout, for flows that become inactive, > > + is not configurable. It will vary depending on the Open > > + vSwitch version, the forms and contents of the OpenFlow flow > > + tables, CPU and memory usage, and network activity. A typical > > + passive timeout is about a second. > > + </p> > > </column> > > > > <column name="add_id_to_interface"> > > -- > > 2.1.1 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
