Merge pull request #679 from yast/merge_SLE-15-GA

Merge SLE-15-GA into master
yast · Oct 9, 2018 · 83ef00f · 83ef00f
2 parents 4ef650d + ead119f
commit 83ef00f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct  4 21:46:23 UTC 2018 - knut.anderssen@suse.com
+
+- Fixes to the networking AY schema (bsc#1108852)
+  - Added missed s390 device 'layer2' boolean element.
+- 4.1.10
+
 -------------------------------------------------------------------
 Wed Oct  3 07:33:01 UTC 2018 - mfilka@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.1.9
+Version:        4.1.10
 Release:        0
 BuildArch:      noarch
 

diff --git a/src/autoyast-rnc/networking.rnc b/src/autoyast-rnc/networking.rnc
@@ -98,6 +98,7 @@ s390-devices =
 device =
   element (device | listentry) {
     element type { text }? &
+    element layer2 { BOOLEAN}? &
     element chanids { text }? &
     element portname { text }? &
     element protocol { text }? &