Thanks, applied to master.
On Mon, Mar 31, 2014 at 01:25:18PM -0700, Justin Pettit wrote:
> Acked-by: Justin Pettit <jpet...@nicira.com>
>
> --Justin
>
>
> Ben Pfaff wrote:
> >Every other table has an external_ids column, which can be useful to
> >controller writers for integration purposes, so add one to Flow_Table also.
> >
> >Reported-by: Ariel Tubaltsev<atubalt...@vmware.com>
> >Signed-off-by: Ben Pfaff<b...@nicira.com>
> >---
> > AUTHORS | 1 +
> > vswitchd/vswitch.ovsschema | 9 ++++++---
> > vswitchd/vswitch.xml | 7 +++++++
> > 3 files changed, 14 insertions(+), 3 deletions(-)
> >
> >diff --git a/AUTHORS b/AUTHORS
> >index b189957..89a9ad8 100644
> >--- a/AUTHORS
> >+++ b/AUTHORS
> >@@ -146,6 +146,7 @@ Andrei Andone andrei.and...@softvision.ro
> > Anshuman Manral anshuman.man...@outlook.com
> > Anton Matsiuk anton.mats...@gmail.com
> > Anuprem Chalvadi achalv...@vmware.com
> >+Ariel Tubaltsev atubalt...@vmware.com
> > Atzm Watanabe a...@stratosphere.co.jp
> > Bastian Blank wa...@debian.org
> > Ben Basler bbas...@nicira.com
> >diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema
> >index efaa1da..3fb45d1 100644
> >--- a/vswitchd/vswitch.ovsschema
> >+++ b/vswitchd/vswitch.ovsschema
> >@@ -1,6 +1,6 @@
> > {"name": "Open_vSwitch",
> >- "version": "7.4.0",
> >- "cksum": "2387737815 20431",
> >+ "version": "7.5.0",
> >+ "cksum": "1448369194 20560",
> > "tables": {
> > "Open_vSwitch": {
> > "columns": {
> >@@ -303,7 +303,10 @@
> > "groups": {
> > "type": {"key": "string", "min": 0, "max": "unlimited"}},
> > "prefixes": {
> >- "type": {"key": "string", "min": 0, "max": 3}}}},
> >+ "type": {"key": "string", "min": 0, "max": 3}},
> >+ "external_ids": {
> >+ "type": {"key": "string", "value": "string",
> >+ "min": 0, "max": "unlimited"}}}},
> > "QoS": {
> > "columns": {
> > "type": {
> >diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
> >index b0a8577..78594e7 100644
> >--- a/vswitchd/vswitch.xml
> >+++ b/vswitchd/vswitch.xml
> >@@ -2628,6 +2628,13 @@
> > one flow table. Currently this limit is 3.
> > </p>
> > </column>
> >+
> >+<group title="Common Columns">
> >+ The overall purpose of these columns is described under<code>Common
> >+ Columns</code> at the beginning of this document.
> >+
> >+<column name="external_ids"/>
> >+</group>
> > </table>
> >
> > <table name="QoS" title="Quality of Service configuration">
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
