From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 12 Dec 2013 21:22:32 +0000 (+0000)
Subject: Merge "Openflowyang - added StripVlan, nwTos changes"
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~201
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=50598f3ccf91107069821376c8b52afcbd13b6b7;hp=713279a4aa4984b57e1a5c0f6645aed9e78a65c9

Merge "Openflowyang - added StripVlan, nwTos changes"
---

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang
index 81303d6867..43754a1dfd 100644
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-action-types.yang
@@ -332,7 +332,11 @@ module opendaylight-action-types {
                  }            
              }
             }
-             
+
+	    case strip-vlan-action-case {
+                container strip-vlan-action {
+                }
+             }
 
             case sw-path-action-case {            
                 container sw-path-action {
@@ -340,4 +344,4 @@ module opendaylight-action-types {
              }  
          }
      }
-}
\ No newline at end of file
+}