commit 3018daa4c19ff5cac9b0f4d035035048b794271d
author Filip Pytloun <filip.pytloun@tcpcloud.eu> Mon Jun 13 09:56:46 2016 +0200
committer Filip Pytloun <filip.pytloun@tcpcloud.eu> Mon Jun 13 09:56:46 2016 +0200
tree b4e7990ba7c01582de4189e60685635e3099da34
parent cd13e445a91652568191716657caede763f3b0ae
parent 9eba909e263be386bf9d635e2a7a241b24bd28fa

Merge branch 'hotfix/packages' into 'master'

Hotfix/packages

See merge request !3

README.rst

diff --git a/README.rst b/README.rst
index a1a0d8f..237812c 100644
--- a/README.rst
+++ b/README.rst
@@ -98,6 +98,7 @@
         master:
           host: jenkins.example.com
           port: 80
+          protocol: http
         user:
           name: jenkins_slave
           password: dexiech6AepohthaiHook2iesh7ol5ook4Ov3leid3yek6daid2ooNg3Ee2oKeYo

jenkins/files/jenkins_jobs.ini

diff --git a/jenkins/files/jenkins_jobs.ini b/jenkins/files/jenkins_jobs.ini
index d71f07d..577badb 100644
--- a/jenkins/files/jenkins_jobs.ini
+++ b/jenkins/files/jenkins_jobs.ini
@@ -1,5 +1,8 @@
 [job_builder]
 recursive=True
+{%- if pillar.jenkins.job_builder.get('allow_empty_variables', False) %}
+allow_empty_variables=true
+{%- endif %}
 
 [jenkins]
 user={{ pillar.jenkins.job_builder.master.user }}