| Message ID | 1572721534-4196-1-git-send-email-dlu998@gmail.com |
|---|---|
| State | Accepted |
| Commit | 13ede8c1129e1c234658d5853841782f64fe5b39 |
| Headers | show |
| Series | [ovs-dev,v1] faq: Fix meter action releases. | expand |
On Sat, Nov 02, 2019 at 12:05:34PM -0700, Darrell Ball wrote: > At the same time disambiguate some feature descriptions. > 'Meters' is changed to 'Meter action' to clarify that the entry > describes the Openflow meter action rather than port based meters. > 'NAT' is changed to 'Conntrack NAT' to indicate that this entry > represents NAT done in 'conntrack', rather than basic Openflow > IP address and L4 port modifications. > > Signed-off-by: Darrell Ball <dlu998@gmail.com> Thanks a lot for looking at this. Probably no one else would have noticed these discrepancies. I applied this to master.
diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index 1dd4912..4152345 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -119,7 +119,7 @@ Q: Are all features available with all datapaths? Conntrack Fragment Reass. 4.3 2.6 2.10 YES Conntrack Timeout Policies 5.2 2.12 NO NO Conntrack Zone Limit 4.18 2.10 NO YES - NAT 4.6 2.6 2.8 YES + Conntrack NAT 4.6 2.6 2.8 YES Tunnel - LISP NO 2.11 NO NO Tunnel - STT NO 2.4 NO YES Tunnel - GRE 3.11 1.0 2.4 YES @@ -137,7 +137,7 @@ Q: Are all features available with all datapaths? Set action YES 1.0 1.0 PARTIAL NIC Bonding YES 1.0 1.0 YES Multiple VTEPs YES 1.10 1.10 YES - Meters 4.15 1.10 1.10 NO + Meter action 4.15 2.10 2.7 NO ========================== ============== ============== ========= ======= Do note, however:
At the same time disambiguate some feature descriptions. 'Meters' is changed to 'Meter action' to clarify that the entry describes the Openflow meter action rather than port based meters. 'NAT' is changed to 'Conntrack NAT' to indicate that this entry represents NAT done in 'conntrack', rather than basic Openflow IP address and L4 port modifications. Signed-off-by: Darrell Ball <dlu998@gmail.com> --- Documentation/faq/releases.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)