The update is incomplete, so document that also.
Reported-by: Stephen Finucane <stephen.finuc...@intel.com>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
AUTHORS | 1 +
OPENFLOW-1.1+ | 6 ++++++
utilities/ovs-ofctl.8.in | 10 ++++++----
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 63c1ef8..f621dd9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -213,4 +213,5 @@ Spiro Kourtessis sp...@vmware.com
Srini Seetharaman seeth...@stanford.edu
Stephen Hemminger shemmin...@vyatta.com
+Stephen Finucane stephen.finuc...@intel.com
Takayuki HAMA t-h...@cb.jp.nec.com
Teemu Koponen kopo...@nicira.com
diff --git a/OPENFLOW-1.1+ b/OPENFLOW-1.1+
index 7a75c44..9286aee 100644
--- a/OPENFLOW-1.1+
+++ b/OPENFLOW-1.1+
@@ -169,4 +169,10 @@ didn't compare the specs carefully yet.)
[optional for OF1.3+]
+General
+-----
+
+ * ovs-ofctl(8) often lists as Nicira extensions features that
+ later OpenFlow versions support in standard ways.
+
How to contribute
diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in
index 3141eff..efc6a91 100644
--- a/utilities/ovs-ofctl.8.in
+++ b/utilities/ovs-ofctl.8.in
@@ -347,5 +347,6 @@ When a switch has more than one controller configured, only
the
traffic to and from a single controller is output. If none of the
controllers is configured as a master or a slave (using a Nicira
-extension to OpenFlow), then a controller is chosen arbitrarily among
+extension to OpenFlow 1.0 or 1.1, or a standard request in OpenFlow
+1.2 or later), then a controller is chosen arbitrarily among
them. If there is a master controller, it is chosen; otherwise, if
there are any controllers that are not masters or slaves, one is
@@ -705,7 +706,8 @@ all tables.
.IP
When this field is specified in \fBadd-flow\fR, \fBadd-flows\fR,
-\fBmod-flows\fR and \fBdel-flows\fR commands, it activates a Nicira
-extension to OpenFlow, which as of this writing is only known to be
-implemented by Open vSwitch.
+\fBmod-flows\fR and \fBdel-flows\fR commands in OpenFlow 1.0, it
+activates a Nicira extension to OpenFlow, which as of this writing is
+only known to be implemented by Open vSwitch. Later versions of
+OpenFlow standardized this feature.
.
.IP \fBmetadata=\fIvalue\fR[\fB/\fImask\fR]
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
