Skip to content
Permalink
Browse files

Merge branch 'SLE-12-GA' into relaxng-compilable-m

Conflicts:
	package/yast2-network.changes
	package/yast2-network.spec
  • Loading branch information...
mvidner committed Oct 8, 2015
2 parents 7571411 + 9244386 commit ceec2e4fe7a2f281f2d317ffd2a10415f91e3291
Showing with 12 additions and 8 deletions.
  1. +8 −0 package/yast2-network.changes
  2. +1 −1 package/yast2-network.spec
  3. +3 −7 src/autoyast-rnc/networking.rnc
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 8 12:02:44 UTC 2015 - mvidner@suse.com

- Fixed "Relax-NG parser error : Some defines for ipv6_forward
needs the combine attribute" when checking validity
of any AutoYaST profile (bsc#948206).
- 3.1.133

-------------------------------------------------------------------
Tue Oct 6 16:44:44 UTC 2015 - mfilka@suse.com

@@ -17,7 +17,7 @@


Name: yast2-network
Version: 3.1.132
Version: 3.1.133
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -221,16 +221,12 @@ dhclient_hostname_option = element dhclient_hostname_option { text }

routing =
element routing {
ip_forward? &
ipv4_forward? &
ipv6_forward? &
element ip_forward { BOOLEAN }? &
element ipv4_forward { BOOLEAN }? &
element ipv6_forward { BOOLEAN }? &
routes?
}

ip_forward = element ip_forward { BOOLEAN }
ipv4_forward = element ipv4_forward { BOOLEAN }
ipv6_forward = element ipv6_forward { BOOLEAN }

routes =
element routes {
LIST,

0 comments on commit ceec2e4

Please sign in to comment.
You can’t perform that action at this time.