Merge pull request #395 from mchf/master

Fixed internal error found by OpenQA
yast · Apr 11, 2016 · 6f1aa6a · 6f1aa6a
2 parents 8475275 + 89703e3
commit 6f1aa6a
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 @@
+-------------------------------------------------------------------
+Mon Apr 11 09:42:20 UTC 2016 - mfilka@suse.com
+
+- bnc#955217, bnc#956605
+  - fixed internal error caused by the previous patch
+- 3.1.146
+
 -------------------------------------------------------------------
 Mon Apr  4 17:24:13 UTC 2016 - 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.145
+Version:        3.1.146
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb
@@ -23,6 +23,7 @@
 # **************************************************************************
 require "yast"
 require "yaml"
+require "network/install_inf_convertor"
 
 module Yast
   # Does way too many things.