Merge pull request #13 from imobach/merge-sle-12-sp1-after_release

Merge SLE 12 SP1 after release branch
yast · Jan 13, 2016 · 922452d · 922452d
2 parents 1cac71c + 48f0420
commit 922452d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-dhcp-server.changes b/package/yast2-dhcp-server.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov 17 09:43:38 UTC 2015 - igonzalezsosa@suse.com
+
+- Fix validation of AutoYaST profiles (bsc#954412)
+- 3.1.5.1
+
 -------------------------------------------------------------------
 Thu Dec  4 09:50:01 UTC 2014 - jreidinger@suse.com
 
 - remove X-KDE-Library from desktop file (bnc#899104)
+- 3.1.5
 
 -------------------------------------------------------------------
 Fri Sep 19 08:28:57 UTC 2014 - ancor@suse.com

diff --git a/package/yast2-dhcp-server.spec b/package/yast2-dhcp-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dhcp-server
-Version:        3.1.5
+Version:        3.1.5.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/autoyast-rnc/dhcp-server.rnc b/src/autoyast-rnc/dhcp-server.rnc
@@ -15,8 +15,8 @@ dhcp-server = element dhcp-server {
 allowed_interfaces = 
   element allowed_interfaces {
     LIST,
-    allowed_interface+
-}  
+    allowed_interface*
+}
 
 allowed_interface = element allowed_interface { text }