Hello community,

here is the log from the commit of package velum for openSUSE:Factory checked 
in at 2018-02-18 11:42:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/velum (Old)
 and      /work/SRC/openSUSE:Factory/.velum.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "velum"

Sun Feb 18 11:42:49 2018 rev:6 rq:577057 
version:3.0.0+dev+git_r646_67806291a2f2903835f76b154b3e1b4811873011

Changes:
--------
--- /work/SRC/openSUSE:Factory/velum/velum.changes      2018-02-09 
15:51:17.803309230 +0100
+++ /work/SRC/openSUSE:Factory/.velum.new/velum.changes 2018-02-18 
11:42:51.856523989 +0100
@@ -1,0 +2,10 @@
+Thu Feb 15 15:53:55 UTC 2018 - containers-bugow...@suse.de
+
+- Commit 6189bca by Kiall Mac Innes ki...@macinnes.ie
+ Reduce salt-api timeout from 60 sec, to 30 sec
+ 
+ HAProxy has a 50 sec timeout, meaning HAProxy will kill the connection before
+ Velum times out waiting for salt-api when there are issues.
+
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ velum.spec ++++++
--- /var/tmp/diff_new_pack.tlyyw2/_old  2018-02-18 11:42:52.700493692 +0100
+++ /var/tmp/diff_new_pack.tlyyw2/_new  2018-02-18 11:42:52.704493549 +0100
@@ -23,7 +23,7 @@
 # Version:      1.0.0
 # %%define branch 1.0.0
 
-Version:        3.0.0+dev+git_r644_b0361e81be2d64b10de6b8c676dce394044f164a
+Version:        3.0.0+dev+git_r646_67806291a2f2903835f76b154b3e1b4811873011
 Release:        0
 %define branch master
 Summary:        Dashboard for CaasP
@@ -96,7 +96,7 @@
 %description
 velum is the dashboard for CaasP to manage and deploy kubernetes clusters on 
top of MicroOS
 
-This package has been built with commit 
b0361e81be2d64b10de6b8c676dce394044f164a from branch master on date Thu, 08 Feb 
2018 12:27:49 +0000
+This package has been built with commit 
67806291a2f2903835f76b154b3e1b4811873011 from branch master on date Thu, 15 Feb 
2018 15:53:13 +0000
 
 %prep
 %setup -q -n velum-%{branch}

++++++ master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/velum-master/lib/velum/salt_api.rb 
new/velum-master/lib/velum/salt_api.rb
--- old/velum-master/lib/velum/salt_api.rb      2018-02-08 13:27:18.000000000 
+0100
+++ new/velum-master/lib/velum/salt_api.rb      2018-02-15 16:53:11.000000000 
+0100
@@ -77,7 +77,14 @@
           req.body = data.to_json if data.present?
         end
 
-        opts = { use_ssl: true, ca_file: "/etc/pki/ca.crt", ssl_version: 
:TLSv1, open_timeout: 2 }
+        opts = {
+          use_ssl:      true,
+          ca_file:      "/etc/pki/ca.crt",
+          ssl_version:  :TLSv1,
+          open_timeout: 2,
+          read_timeout: 30
+        }
+
         Net::HTTP.start(uri.hostname, uri.port, opts) { |http| 
http.request(req) }
       rescue *HTTPExceptions::EXCEPTIONS => e
         raise SaltConnectionException, e


Reply via email to