From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 28 Nov 2013 09:45:10 +0000 (+0000)
Subject: Merge "Table features : modified yang model. Patch set 2: Modified match types as... 
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~322
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b2d4575c4425e3b3d5aeaf1190e01e5d5a5286aa

Merge "Table features : modified yang model. Patch set 2: Modified match types as identity for extensibility."
---

b2d4575c4425e3b3d5aeaf1190e01e5d5a5286aa
diff --cc opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
index 1b6a689750,52629516f3..3774f950fc
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
@@@ -167,15 -314,15 +314,15 @@@ module opendaylight-table-types 
              }
              
              container table-properties {
-                 list instruction-id {
-                     key "order";
-                     leaf order {
-                         type int32;
-                     }
-                     
-                     uses table-feature-prop-type;
+                 list table-feature-properties {
+                      key "order";
+                      leaf order {
+                          type int32;
+                      }
+                      uses table-feature-prop-type;
                  }
              }
+ 
          }
      }    
--}
++}