Merge branch 'master' into master

This commit is contained in:
Jeffrey E 2018-04-27 09:04:02 +02:00 committed by GitHub
commit 6cf11ef2cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -21,7 +21,7 @@ provisioner:
extra_vars: extra_vars:
es_major_version: "<%= ENV['VERSION'] %>" es_major_version: "<%= ENV['VERSION'] %>"
<% if ENV['VERSION'] == '5.x' %> <% if ENV['VERSION'] == '5.x' %>
es_version: '5.6.8' es_version: '5.6.9'
<% end %> <% end %>
<% end %> <% end %>

View file

@ -1,6 +1,6 @@
--- ---
es_major_version: "6.x" es_major_version: "6.x"
es_version: "6.2.3" es_version: "6.2.4"
es_version_lock: false es_version_lock: false
es_use_repository: true es_use_repository: true
es_templates_fileglob: "files/templates/*.json" es_templates_fileglob: "files/templates/*.json"