Merge branch 'SLE-15-GA' into merge_SLE-15-GA

yast · May 4, 2018 · 53938cf · 53938cf
2 parents 3be811d + 87c9ff5
commit 53938cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM yastdevel/ruby
+FROM yastdevel/ruby:sle15
 COPY . /usr/src/app
 
diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,7 @@
 require "yast/rake"
 
+Yast::Tasks.submit_to :sle15
+
 Yast::Tasks.configuration do |conf|
   #lets ignore license check for now
   conf.skip_license_check << /.*/

diff --git a/package/yast2-iscsi-lio-server.changes b/package/yast2-iscsi-lio-server.changes
@@ -4,22 +4,23 @@ Wed May  2 09:43:35 UTC 2018 - lszhu@suse.com
 - bsc#1091626
   Change regular expression for matching a LUN path, in order
   to pick file names include special characters.
-- 4.10
+- 4.0.10
 
 -------------------------------------------------------------------
 Sat Apr 28 05:59:05 UTC 2018 - lszhu@suse.com
 
 - bsc#1091194
   Change Adding LUN dialog UI, place "Browse" button under LUN
   path input field, avoid unaligned UI.
+- 4.0.9
 
 -------------------------------------------------------------------
 Tue Apr 10 08:58:28 UTC 2018 - lszhu@suse.com
 
 - bsc#1088677
   A better UI layout for IP selection combox and port input field
   in AddTarget Page.
--4.08
+- 4.0.8
 
 -------------------------------------------------------------------
 Mon Mar 26 13:22:53 UTC 2018 - cwh@suse.com