From c07c7331437a3eb0f90e209434d7cda11e80fbfa Mon Sep 17 00:00:00 2001
From: Denys Havrysh <denis.gavrysh@zoomdata.com>
Date: Wed, 24 Oct 2018 13:04:08 +0300
Subject: [PATCH] Release 3.6.0

---
 CHANGELOG.rst  | 14 ++++++++++++++
 VERSION        |  2 +-
 pillar.example | 18 +++++++++---------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 988ea9d..868b3ab 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,20 @@
 zoomdata-formula
 ================
 
+3.6.0 (2018-10-24)
+
+- Added new ``zoomdata.setup`` SLS that allows setting up initial passwords,
+  UI branding, adjust supervisor settings and install license for the Zoomdata
+  server
+- If the ``zoomdata`` service is configured to start (that's by default), it
+  will be queried for successful response on REST API call for 900 seconds,
+  when no other value specified in the ``zoomdata:setup:timeout`` Pillar value.
+- Added examples of security related configuration parameters
+- Added support for configuring ``*.jvm`` files (JVM command line options)
+- Fixed detection of core Zoomdata packages during upgrades
+- Fixed invoking backup state if no backup configured or nothing to upgrade
+- Cleaned up legacy stuff
+
 3.5.0 (2018-09-24)
 
 - The tracing service (OpenZipkin) was renamed to ``zoomdata-tracing-server``
diff --git a/VERSION b/VERSION
index 1545d96..40c341b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.5.0
+3.6.0
diff --git a/pillar.example b/pillar.example
index 18affac..e18f188 100644
--- a/pillar.example
+++ b/pillar.example
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml ts=2 sts=2 sw=2 et
 
-### Zoomdata 3.5 provisioning configuration example.
+### Zoomdata 3.6 provisioning configuration example.
 ###
 ### This is Salt Pillar file written in SaltStack's (SLS) format:
 ### YAML rendered with Jinja2 template engine.
@@ -20,7 +20,7 @@ zoomdata:
   gpgkey: 'https://repo.zoomdata.com/ZOOMDATA-GPG-KEY.pub'
   # Repository branch from which the packages would be installed.
   # This would be overridden by ``ZOOMDATA_RELEASE`` environment variable.
-  release: 3.5
+  release: 3.6
 
   # Additional repositories under the ``base_url`` to get packages from
   repositories:
@@ -54,10 +54,10 @@ zoomdata:
   # This would be overridden by ``ZOOMDATA_VERSION`` environment variable.
   {%- if grains['os'] == 'Ubuntu' %}
   # Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
-  #version: "3.5.0-5+{{ grains['oscodename'] }}.stable"
+  #version: "3.6.0-10+{{ grains['oscodename'] }}.stable"
   {%- else %}
   # Packages version for RHEL/CentOS systems
-  #version: '3.5.0'
+  #version: '3.6.0'
   {%- endif %}
 
   # Zoomdata core packages to install
@@ -76,10 +76,10 @@ zoomdata:
     # This would be overridden by ``ZOOMDATA_EDC_VERSION`` environment variable.
     {%- if grains['os'] == 'Ubuntu' %}
     # Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
-    #version: "3.5.0-2+{{ grains['oscodename'] }}.stable"
+    #version: "3.6.0-3+{{ grains['oscodename'] }}.stable"
     {%- else %}
     # Packages version for RHEL/CentOS systems
-    #version: '3.5.0'
+    #version: '3.6.0'
     {%- endif %}
 
     # Zoomdata EDC packages to install
@@ -127,10 +127,10 @@ zoomdata:
     # This would be overridden by ``ZOOMDATA_EDC_VERSION`` environment variable.
     {%- if grains['os'] == 'Ubuntu' %}
     # Ubuntu-specific version template: EDIT NUMBERS BEFORE curly braces!
-    #version: "3.5.0-5+{{ grains['oscodename'] }}.stable"
+    #version: "3.6.0-1+{{ grains['oscodename'] }}.stable"
     {%- else %}
     # Packages version for RHEL/CentOS systems
-    #version: '3.5.0'
+    #version: '3.6.0'
     {%- endif %}
 
     # Zoomdata microservice packages to install
@@ -369,7 +369,7 @@ zoomdata:
     #- zoomdata-xvfb
     - zoomdata-screenshot-service
 
-    # The admin service based on Spring Boot Admin is available in
+    # The admin service based on Spring Boot Admin is available since
     # Zoomdata 3.5 release. This is optional and disabled by default.
     #- zoomdata-admin-server