Merge changes I24adce35,Ia5947ae6

* changes:
  Revert "Fix shorthand case statement in netconf notifications model"
  Revert "Better FIXME comment in ietf-netconf-notifications model"

diff --git a/opendaylight/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang b/opendaylight/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang
index 1c8d94438e0f39963233214400d006ccc40d68e5..456fde49266c44f759073662ca801c081cf57ea8 100644 (file)
--- a/opendaylight/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang
+++ b/opendaylight/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang
@@ -103,15 +103,13 @@ module ietf-netconf-notifications {
          of the session that made the change will be reported.";
       choice server-or-user {
         mandatory true;
-        //FIXME: After Bug 4414 is resolved, use shorthand version of case statement
-        case server {
-          leaf server {
-            type empty;
-            description
+        leaf server {
+          type empty;
+          description
             "If present, the change was caused
-            by the server.";
-          }
+             by the server.";
         }
+
         case by-user {
           uses common-session-parms;
         }