Merge pull request #312 from mchf/master

Merged SLE-12 branch only
yast · Jun 10, 2015 · 86b5553 · 86b5553
2 parents f923314 + 2e3ff23
commit 86b5553
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 10 08:37:59 UTC 2015 - mfilka@suse.com
+
+- bnc#934180
+  - fixed internal error in lan AutoYaST client.
+- 3.1.117
+
 -------------------------------------------------------------------
 Mon Jun  8 09:58:46 UTC 2015 - mfilka@suse.com
 

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

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -109,7 +109,8 @@ ylib_DATA = \
   lib/network/edit_nic_name.rb \
   lib/network/confirm_virt_proposal.rb \
   lib/network/install_inf_convertor.rb \
-  lib/network/network_autoconfiguration.rb
+  lib/network/network_autoconfiguration.rb \
+  lib/network/network_autoyast.rb
 
 EXTRA_DIST = \
   $(module_DATA) \