Merging upstream version 10.2.

Signed-off-by: Daniel Baumann <daniel@debian.org>

1 files changed, 11 insertions, 0 deletions

diff --git a/yang/frr-zebra.yang b/yang/frr-zebra.yang
index 79c524a4..f97a4cc1 100644
--- a/yang/frr-zebra.yang
+++ b/yang/frr-zebra.yang
@@ -626,6 +626,7 @@ module frr-zebra {
 
         leaf table-id {
           type uint32;
+	  default "254";
           description
             "Routing Table id (default id - 254).";
         }
@@ -2855,6 +2856,16 @@ module frr-zebra {
         }
       }
 
+      container mpls {
+        description
+          "MPLS Configuration.";
+          leaf fec-nexthop-resolution {
+            type boolean;
+            description
+              "Authorise nexthop resolution over all labeled routes.";
+          }
+      }
+
       uses ribs;
 
       uses vrf-vni-mapping;