From 1118f70e6644d4c75df63fefa2d9b35369956508 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 30 Sep 2019 16:05:06 +0100
Subject: [PATCH 01/42] chore(issues): provide `Bug report` & `Feature request`
 templates [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/48
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 54 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 42 ++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..04af2ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,54 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: '[BUG] '
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--
+Notes:
+1. Only post _bug reports_ here.
+2. Use the appropriate template for _feature requests_.
+3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
+-->
+
+#### Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+
+
+#### Setup
+<!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
+
+
+
+#### Steps to reproduce the bug
+<!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
+<!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
+<!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
+
+
+
+#### Expected behaviour
+<!-- A clear and concise description of what you expected to happen. -->
+
+
+
+#### Versions report
+<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
+
+
+
+#### Additional context
+<!-- Add any other context about the problem here. -->
+
+
+
+---
+
+#### Optional: How can this template be improved?
+<!-- Feel free to suggest how this template can be improved. -->
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..ae0b773
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,42 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: '[FEATURE] '
+labels: 'enhancement'
+assignees: ''
+
+---
+
+<!--
+Notes:
+1. Only post _feature requests_ here.
+2. Use the appropriate template for _bug reports_.
+3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
+-->
+
+#### Is your feature request related to a problem?
+<!-- A clear and concise description of what the problem is. -->
+
+
+
+#### Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+
+
+#### Describe alternatives you've considered
+<!-- Describe any alternative solutions or features you've considered. -->
+
+
+
+#### Additional context
+<!-- Add any other context about the feature request here. -->
+
+
+
+---
+
+#### Optional: How can this template be improved?
+<!-- Feel free to suggest how this template can be improved. -->
+
+

From 8f36788bfc47a4943594b964fe595efb6c1bc5cf Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 1 Oct 2019 16:24:04 +0100
Subject: [PATCH 02/42] ci(platform): add `arch-base-latest` (commented out for
 now) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/50
---
 .travis.yml                             |  3 +++
 kitchen.yml                             | 15 +++++++++++++++
 test/integration/v201707-py2/inspec.yml |  1 +
 test/integration/v201803-py2/inspec.yml |  1 +
 test/integration/v201902-py2/inspec.yml |  1 +
 test/integration/v201902-py3/inspec.yml |  1 +
 6 files changed, 22 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 778a844..c134b00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,15 +28,18 @@ env:
     - INSTANCE: v201707-py2-ubuntu-1604-2017-7-py2
     - INSTANCE: v201707-py2-centos-6-2017-7-py2
     # - INSTANCE: v201707-py2-amazonlinux-2-2017-7-py2
+    # - INSTANCE: v201707-py2-arch-base-latest-2017-7-py2
     # - INSTANCE: v201803-py2-debian-9-2018-3-py2
     # - INSTANCE: v201803-py2-ubuntu-1604-2018-3-py2
     - INSTANCE: v201803-py2-centos-7-2018-3-py2
     - INSTANCE: v201803-py2-amazonlinux-2-2018-3-py2
+    # - INSTANCE: v201803-py2-arch-base-latest-2018-3-py2
     - INSTANCE: v201902-py2-debian-9-2019-2-py2
     - INSTANCE: v201902-py2-ubuntu-1804-2019-2-py2
     # - INSTANCE: v201902-py2-centos-7-2019-2-py2
     # - INSTANCE: v201902-py2-opensuse-leap-15-2019-2-py2
     # - INSTANCE: v201902-py2-amazonlinux-2-2019-2-py2
+    # - INSTANCE: v201902-py2-arch-base-latest-2019-2-py2
     # - INSTANCE: v201902-py3-debian-9-2019-2-py3
     # - INSTANCE: v201902-py3-ubuntu-1804-2019-2-py3
     # - INSTANCE: v201902-py3-centos-7-2019-2-py3
diff --git a/kitchen.yml b/kitchen.yml
index 275de36..160a12d 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -25,6 +25,10 @@ platforms:
   - name: amazonlinux-2-2017-7-py2
     driver:
       image: netmanagers/salt-2017.7-py2:amazonlinux-2
+  - name: arch-base-latest-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
 
   ## SALT `2018.3`
   - name: debian-9-2018-3-py2
@@ -39,6 +43,10 @@ platforms:
   - name: amazonlinux-2-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:amazonlinux-2
+  - name: arch-base-latest-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
 
   ## SALT `2019.2`
   - name: debian-9-2019-2-py2
@@ -61,6 +69,10 @@ platforms:
   - name: amazonlinux-2-2019-2-py2
     driver:
       image: netmanagers/salt-2019.2-py2:amazonlinux-2
+  - name: arch-base-latest-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
   - name: debian-9-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:debian-9
@@ -134,6 +146,7 @@ suites:
       - centos-7-2019-2-py2
       - opensuse-leap-15-2019-2-py2
       - amazonlinux-2-2019-2-py2
+      - arch-base-latest-2019-2-py2
     provisioner:
       state_top:
         base:
@@ -159,6 +172,7 @@ suites:
       - ubuntu-1604-2018-3-py2
       - centos-7-2018-3-py2
       - amazonlinux-2-2018-3-py2
+      - arch-base-latest-2018-3-py2
     provisioner:
       state_top:
         base:
@@ -184,6 +198,7 @@ suites:
       - ubuntu-1604-2017-7-py2
       - centos-6-2017-7-py2
       - amazonlinux-2-2017-7-py2
+      - arch-base-latest-2017-7-py2
     provisioner:
       state_top:
         base:
diff --git a/test/integration/v201707-py2/inspec.yml b/test/integration/v201707-py2/inspec.yml
index 3edaedd..f196e73 100644
--- a/test/integration/v201707-py2/inspec.yml
+++ b/test/integration/v201707-py2/inspec.yml
@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch
diff --git a/test/integration/v201803-py2/inspec.yml b/test/integration/v201803-py2/inspec.yml
index 4cb66af..253f5fa 100644
--- a/test/integration/v201803-py2/inspec.yml
+++ b/test/integration/v201803-py2/inspec.yml
@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch
diff --git a/test/integration/v201902-py2/inspec.yml b/test/integration/v201902-py2/inspec.yml
index 7a5266e..688d010 100644
--- a/test/integration/v201902-py2/inspec.yml
+++ b/test/integration/v201902-py2/inspec.yml
@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch
diff --git a/test/integration/v201902-py3/inspec.yml b/test/integration/v201902-py3/inspec.yml
index 5e8eb7b..253280f 100644
--- a/test/integration/v201902-py3/inspec.yml
+++ b/test/integration/v201902-py3/inspec.yml
@@ -15,3 +15,4 @@ supports:
   - platform-name: suse
   - platform-name: freebsd
   - platform-name: amazon
+  - platform-name: arch

From 0c5eb7e51fdaa00d21597441a394dd9708c63a67 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 1 Oct 2019 21:39:17 +0100
Subject: [PATCH 03/42] ci(kitchen): use bootstrapped `opensuse` images until
 `2019.2.2` [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/52
---
 kitchen.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index 160a12d..715a3e7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -60,8 +60,13 @@ platforms:
       image: netmanagers/salt-2019.2-py2:centos-7
   - name: opensuse-leap-15-2019-2-py2
     driver:
-      image: netmanagers/salt-2019.2-py2:opensuse-leap-15
+      image: opensuse/leap:15
+      provision_command:
+        - systemctl enable sshd.service
       run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -XdPfrq -x python2 git 2019.2
+      salt_install: bootstrap
     # Workaround to avoid intermittent failures on `opensuse-leap-15`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
@@ -87,8 +92,13 @@ platforms:
       image: netmanagers/salt-2019.2-py3:fedora-30
   - name: opensuse-leap-15-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15
+      image: opensuse/leap:15
+      provision_command:
+        - systemctl enable sshd.service
       run_command: /usr/lib/systemd/systemd
+    provisioner:
+      salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
+      salt_install: bootstrap
     # Workaround to avoid intermittent failures on `opensuse-leap-15`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:

From 8cc595261d40850fef2813ec7709db1849aa1b44 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 2 Oct 2019 00:12:05 +0100
Subject: [PATCH 04/42] ci(kitchen): install required packages to bootstrapped
 `opensuse` [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/53
---
 kitchen.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kitchen.yml b/kitchen.yml
index 715a3e7..fe3c661 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -62,6 +62,8 @@ platforms:
     driver:
       image: opensuse/leap:15
       provision_command:
+        # yamllint disable-line rule:line-length
+        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
         - systemctl enable sshd.service
       run_command: /usr/lib/systemd/systemd
     provisioner:
@@ -94,6 +96,8 @@ platforms:
     driver:
       image: opensuse/leap:15
       provision_command:
+        # yamllint disable-line rule:line-length
+        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
         - systemctl enable sshd.service
       run_command: /usr/lib/systemd/systemd
     provisioner:

From 94da16ae7a005f6d225c7279e50fd9ef11216edc Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 7 Oct 2019 15:31:56 +0100
Subject: [PATCH 05/42] chore(issues): update `Bug report` & `Feature request`
 templates [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/58
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 32 ++++++++++++++++-------
 .github/ISSUE_TEMPLATE/feature_request.md | 10 +++----
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 04af2ae..1cc8c26 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -14,41 +14,55 @@ Notes:
 3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
 -->
 
-#### Describe the bug
-<!-- A clear and concise description of what the bug is. -->
+## Your setup
+### Formula commit hash / release tag
+<!-- Please specify the formula's commit hash and/or release tag that you are using. -->
 
 
 
-#### Setup
+### Versions reports (master & minion)
+<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
+
+
+
+### Pillar / config used
 <!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
 
 
 
-#### Steps to reproduce the bug
+---
+
+## Bug details
+### Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+
+
+### Steps to reproduce the bug
 <!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
 <!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
 <!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
 
 
 
-#### Expected behaviour
+### Expected behaviour
 <!-- A clear and concise description of what you expected to happen. -->
 
 
 
-#### Versions report
-<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
+### Attempts to fix the bug
+<!-- Please mention any attempts you have made to fix the bug and what the results were. -->
 
 
 
-#### Additional context
+### Additional context
 <!-- Add any other context about the problem here. -->
 
 
 
 ---
 
-#### Optional: How can this template be improved?
+### Meta: How can this template be improved?
 <!-- Feel free to suggest how this template can be improved. -->
 
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ae0b773..be8be36 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -14,29 +14,29 @@ Notes:
 3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
 -->
 
-#### Is your feature request related to a problem?
+### Is your feature request related to a problem?
 <!-- A clear and concise description of what the problem is. -->
 
 
 
-#### Describe the solution you'd like
+### Describe the solution you'd like
 <!-- A clear and concise description of what you want to happen. -->
 
 
 
-#### Describe alternatives you've considered
+### Describe alternatives you've considered
 <!-- Describe any alternative solutions or features you've considered. -->
 
 
 
-#### Additional context
+### Additional context
 <!-- Add any other context about the feature request here. -->
 
 
 
 ---
 
-#### Optional: How can this template be improved?
+### Meta: How can this template be improved?
 <!-- Feel free to suggest how this template can be improved. -->
 
 

From 33b133c200c5dd47dc5ea847a0c4d457edf0224b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 7 Oct 2019 19:37:27 +0100
Subject: [PATCH 06/42] chore(yamllint): update ignored paths and add
 `octal-values` [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/59
---
 .yamllint | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.yamllint b/.yamllint
index 11d3be1..7f0d184 100644
--- a/.yamllint
+++ b/.yamllint
@@ -7,10 +7,12 @@ extends: default
 # Files to ignore completely
 # 1. All YAML files under directory `node_modules/`, introduced during the Travis run
 # 2. Any SLS files under directory `test/`, which are actually state files
-# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
+# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 4. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
 ignore: |
   node_modules/
   test/**/states/**/*.sls
+  .kitchen/
   salt/osfamilymap.yaml
   salt/osmap.yaml
 
@@ -31,3 +33,6 @@ rules:
     # Increase from default of `80`
     # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
     max: 88
+  octal-values:
+    forbid-implicit-octal: true
+    forbid-explicit-octal: true

From 64c6ba9ec3f3230e00d4cae00e5ed195236a7b24 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 8 Oct 2019 16:40:06 +0100
Subject: [PATCH 07/42] ci: merge travis matrix, add `salt-lint` & `rubocop` to
 `lint` job

* Automated using https://github.com/myii/ssf-formula/pull/60
---
 .yamllint | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.yamllint b/.yamllint
index 7f0d184..9470339 100644
--- a/.yamllint
+++ b/.yamllint
@@ -20,6 +20,7 @@ yaml-files:
   # Default settings
   - '*.yaml'
   - '*.yml'
+  - .salt-lint
   - .yamllint
   # SaltStack Formulas additional settings
   - '*.example'

From 5b348eb3546fd80bf86da4a1149d72fdd83733ba Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 9 Oct 2019 18:32:11 +0100
Subject: [PATCH 08/42] fix(map.jinja): fix `salt-lint` errors

```bash
Examining salt/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:4
{## Start imports ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:21
{## Merge in salt pillar ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:24
{## Merge in salt_formulas pillar ##}
```
---
 salt/map.jinja | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/map.jinja b/salt/map.jinja
index 8c433b2..67f583d 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=jinja
 
-{## Start imports ##}
+{#- Start imports #}
 {% import_yaml "salt/defaults.yaml" as defaults %}
 {% import_yaml "salt/osfamilymap.yaml" as osfamilymap %}
 {% import_yaml "salt/osmap.yaml" as osmap %}
@@ -18,8 +18,8 @@
 {% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
 {% do salt['defaults.merge'](defaults['salt'], lookup) %}
 
-{## Merge in salt pillar ##}
+{#- Merge in salt pillar #}
 {% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}
 
-{## Merge in salt_formulas pillar ##}
+{#- Merge in salt_formulas pillar #}
 {% set formulas_settings = salt['pillar.get']('salt_formulas',default=defaults['salt_formulas'], merge=True) %}

From 3e6397788f031868e4a2b48af6ebd2f74408676d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 9 Oct 2019 18:32:48 +0100
Subject: [PATCH 09/42] fix(minion.sls): fix `salt-lint` errors

```bash
Examining salt/minion.sls of type state
[210] Numbers that start with `0` should always be encapsulated in quotation marks
salt/minion.sls:20
    - mode: 0644
```
---
 salt/minion.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/minion.sls b/salt/minion.sls
index e492a49..466fdb3 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -17,7 +17,7 @@ download-salt-minion:
     {% endif %}
     - user: root
     - group: wheel
-    - mode: 0644
+    - mode: '0644'
     - unless:
       - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
     - require_in:

From ef4ad1ec5cf4c7e644e041ff82eea52c0cdef7c6 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 9 Oct 2019 18:33:30 +0100
Subject: [PATCH 10/42] fix(syndic.sls): fix `salt-lint` errors

```bash
Examining salt/syndic.sls of type state
[201] Trailing whitespace
salt/syndic.sls:12
  {%- endif %}
```
---
 salt/syndic.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/syndic.sls b/salt/syndic.sls
index 64a86b0..069ae7c 100644
--- a/salt/syndic.sls
+++ b/salt/syndic.sls
@@ -9,7 +9,7 @@ salt-syndic:
     - name: {{ salt_settings.salt_syndic }}
   {%- if salt_settings.version is defined %}
     - version: {{ salt_settings.version }}
-  {%- endif %}    
+  {%- endif %}
     - require_in:
       - service: salt-syndic
     - watch_in:

From e815eaa20dff33ec07d4a2d90213c0431c7041c0 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 9 Oct 2019 18:35:20 +0100
Subject: [PATCH 11/42] ci: merge travis matrix, add `salt-lint` & `rubocop` to
 `lint` job

* Semi-automated using https://github.com/myii/ssf-formula/pull/60
---
 .rubocop.yml |  10 +++++
 .salt-lint   |  13 ++++++
 .travis.yml  | 113 +++++++++++++++++++++++++++++++--------------------
 .yamllint    |   1 +
 Gemfile      |   7 ++--
 bin/kitchen  |  21 ++++++----
 6 files changed, 109 insertions(+), 56 deletions(-)
 create mode 100644 .rubocop.yml
 create mode 100644 .salt-lint

diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..bdae9aa
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+# General overrides used across formulas in the org
+Metrics/LineLength:
+  # Increase from default of `80`
+  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
+  Max: 88
+
+# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
diff --git a/.salt-lint b/.salt-lint
new file mode 100644
index 0000000..a539954
--- /dev/null
+++ b/.salt-lint
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+exclude_paths: []
+skip_list:
+  # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
+  - 205  # Use ".sls" as a Salt State file extension
+  # Skipping `207` and `208` because `210` is sufficient, at least for the time-being
+  # I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
+  - 207  # File modes should always be encapsulated in quotation marks
+  - 208  # File modes should always contain a leading zero
+tags: []
+verbosity: 1
diff --git a/.travis.yml b/.travis.yml
index c134b00..a7b4f50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,62 +1,43 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
+## Machine config
 dist: bionic
-stages:
-  - test
-  - lint
-  - name: release
-    if: branch = master AND type != pull_request
-
 sudo: required
-cache: bundler
-language: ruby
-
 services:
   - docker
 
-# Make sure the instances listed below match up with
-# the `platforms` defined in `kitchen.yml`
-env:
-  matrix:
-    # The ordering used below has been selected based on the time required in Travis
-    # The slower ones are kept as high up as possible, to run concurrently rather than
-    # slow down the entire run at the end (i.e. `centos-6` and `opensuse`)
-    # However, the groupings needed to be maintained in some semblance of order
-    # so this is a best-effort matrix, in the circumstances
-    # - INSTANCE: v201707-py2-debian-8-2017-7-py2
-    - INSTANCE: v201707-py2-ubuntu-1604-2017-7-py2
-    - INSTANCE: v201707-py2-centos-6-2017-7-py2
-    # - INSTANCE: v201707-py2-amazonlinux-2-2017-7-py2
-    # - INSTANCE: v201707-py2-arch-base-latest-2017-7-py2
-    # - INSTANCE: v201803-py2-debian-9-2018-3-py2
-    # - INSTANCE: v201803-py2-ubuntu-1604-2018-3-py2
-    - INSTANCE: v201803-py2-centos-7-2018-3-py2
-    - INSTANCE: v201803-py2-amazonlinux-2-2018-3-py2
-    # - INSTANCE: v201803-py2-arch-base-latest-2018-3-py2
-    - INSTANCE: v201902-py2-debian-9-2019-2-py2
-    - INSTANCE: v201902-py2-ubuntu-1804-2019-2-py2
-    # - INSTANCE: v201902-py2-centos-7-2019-2-py2
-    # - INSTANCE: v201902-py2-opensuse-leap-15-2019-2-py2
-    # - INSTANCE: v201902-py2-amazonlinux-2-2019-2-py2
-    # - INSTANCE: v201902-py2-arch-base-latest-2019-2-py2
-    # - INSTANCE: v201902-py3-debian-9-2019-2-py3
-    # - INSTANCE: v201902-py3-ubuntu-1804-2019-2-py3
-    # - INSTANCE: v201902-py3-centos-7-2019-2-py3
-    - INSTANCE: v201902-py3-fedora-30-2019-2-py3
-    - INSTANCE: v201902-py3-opensuse-leap-15-2019-2-py3
+## Language and cache config
+language: ruby
+cache: bundler
 
+## Script to run for the test stage
 script:
-  - bin/kitchen verify ${INSTANCE}
+  - bin/kitchen verify "${INSTANCE}"
 
+## Stages and jobs matrix
+stages:
+  - test
+  - name: release
+    if: branch = master AND type != pull_request
 jobs:
+  allow_failures:
+    - env: Lint_rubocop
+  fast_finish: true
   include:
-    # Define the `lint` stage (runs `yamllint` and `commitlint`)
-    - stage: lint
-      language: node_js
+    ## Define the test stage that runs the linters (and testing matrix, if applicable)
+
+    # Run all of the linters in a single job (except `rubocop`)
+    - language: node_js
       node_js: lts/*
+      env: Lint
+      name: 'Lint: salt-lint, yamllint & commitlint'
       before_install: skip
       script:
+        # Install and run `salt-lint`
+        - pip install --user salt-lint
+        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
+                       | xargs -I {} salt-lint {}
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
@@ -65,10 +46,54 @@ jobs:
         - npm install @commitlint/config-conventional -D
         - npm install @commitlint/travis-cli -D
         - commitlint-travis
-    # Define the release stage that runs `semantic-release`
+    # Run the `rubocop` linter in a separate job that is allowed to fail
+    # Once these lint errors are fixed, this can be merged into a single job
+    - language: node_js
+      node_js: lts/*
+      env: Lint_rubocop
+      name: 'Lint: rubocop'
+      before_install: skip
+      script:
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d
+
+    ## Define the rest of the matrix based on Kitchen testing
+    # Make sure the instances listed below match up with
+    # the `platforms` defined in `kitchen.yml`
+    # The ordering used below has been selected based on the time required in Travis
+    # The slower ones are kept as high up as possible, to run concurrently rather than
+    # slow down the entire run at the end (i.e. `centos-6` and `opensuse`)
+    # However, the groupings needed to be maintained in some semblance of order
+    # so this is a best-effort matrix, in the circumstances
+    # - env: INSTANCE=v201707-py2-debian-8-2017-7-py2
+    - env: INSTANCE=v201707-py2-ubuntu-1604-2017-7-py2
+    - env: INSTANCE=v201707-py2-centos-6-2017-7-py2
+    # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
+    # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
+    # - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
+    # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
+    - env: INSTANCE=v201803-py2-centos-7-2018-3-py2
+    - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
+    # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
+    - env: INSTANCE=v201902-py2-debian-9-2019-2-py2
+    - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
+    # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
+    # - env: INSTANCE=v201902-py2-opensuse-leap-15-2019-2-py2
+    # - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
+    # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
+    # - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
+    # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
+    - env: INSTANCE=v201902-py3-fedora-30-2019-2-py3
+    - env: INSTANCE=v201902-py3-opensuse-leap-15-2019-2-py3
+
+    ## Define the release stage that runs `semantic-release`
     - stage: release
       language: node_js
       node_js: lts/*
+      env: Release
+      name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
       before_install: skip
       script:
         # Update `AUTHORS.md`
diff --git a/.yamllint b/.yamllint
index 7f0d184..9470339 100644
--- a/.yamllint
+++ b/.yamllint
@@ -20,6 +20,7 @@ yaml-files:
   # Default settings
   - '*.yaml'
   - '*.yml'
+  - .salt-lint
   - .yamllint
   # SaltStack Formulas additional settings
   - '*.example'
diff --git a/Gemfile b/Gemfile
index 3b36de3..5a232b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 gem 'kitchen-docker', '>= 2.9'
-gem 'kitchen-salt', '>= 0.6.0'
 gem 'kitchen-inspec', '>= 1.1'
-
+gem 'kitchen-salt', '>= 0.6.0'
diff --git a/bin/kitchen b/bin/kitchen
index 1cd44f3..dcfdb4c 100755
--- a/bin/kitchen
+++ b/bin/kitchen
@@ -8,22 +8,25 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
     load(bundle_binstub)
   else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+    abort(
+      'Your `bin/bundle` was not generated by Bundler, '\
+      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      '`bundle binstubs bundler --force`, then run this command again.'
+    )
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("test-kitchen", "kitchen")
+load Gem.bin_path('test-kitchen', 'kitchen')

From 15aed4e67ec8e53d23b232a85c6de33ec829e293 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 10 Oct 2019 04:14:31 +0000
Subject: [PATCH 12/42] chore(release): 0.59.4 [skip ci]

## [0.59.4](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4) (2019-10-10)

### Bug Fixes

* **map.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/salt-formula/commit/5b348eb))
* **minion.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/salt-formula/commit/3e63977))
* **syndic.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/salt-formula/commit/ef4ad1e))

### Continuous Integration

* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/8cc5952))
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/0c5eb7e))
* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/8f36788))
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/e815eaa))
---
 AUTHORS.md         |  4 ++--
 CHANGELOG.md       | 17 +++++++++++++++++
 FORMULA            |  2 +-
 docs/AUTHORS.rst   |  4 ++--
 docs/CHANGELOG.rst | 20 ++++++++++++++++++++
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 016462a..05f8cca 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -7,7 +7,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|98
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|31
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|42
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
@@ -106,4 +106,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-09-25.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ecb72a..9c8d069 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.59.4](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4) (2019-10-10)
+
+
+### Bug Fixes
+
+* **map.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/salt-formula/commit/5b348eb))
+* **minion.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/salt-formula/commit/3e63977))
+* **syndic.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/salt-formula/commit/ef4ad1e))
+
+
+### Continuous Integration
+
+* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/8cc5952))
+* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/0c5eb7e))
+* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/8f36788))
+* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/e815eaa))
+
 ## [0.59.3](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.2...v0.59.3) (2019-09-25)
 
 
diff --git a/FORMULA b/FORMULA
index 4f552f7..e6b7404 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.3
+version: 0.59.4
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index c1f99d1..5d9c323 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 31
+     - 42
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
      - `@iggy <https://github.com/iggy>`_
      - 22
@@ -314,4 +314,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-09-25.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-10.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index a2e32f8..3356380 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,26 @@
 Changelog
 =========
 
+`0.59.4 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4>`_ (2019-10-10)
+---------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **map.jinja:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/5b348eb>`_\ )
+* **minion.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/3e63977>`_\ )
+* **syndic.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/ef4ad1e>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/8cc5952>`_\ )
+* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/0c5eb7e>`_\ )
+* **platform:** add ``arch-base-latest`` (commented out for now) [skip ci] (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/8f36788>`_\ )
+* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/e815eaa>`_\ )
+
 `0.59.3 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.2...v0.59.3>`_ (2019-09-25)
 ---------------------------------------------------------------------------------------------------------
 

From 62f82a433457f16dd626c8dcb0bfe123b774dd66 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 11 Oct 2019 20:21:28 +0100
Subject: [PATCH 13/42] fix(rubocop): add fixes using `rubocop
 --safe-auto-correct`

---
 Vagrantfile                                    | 18 +++++++++---------
 .../v201707-py2/controls/pkgs_spec.rb          |  6 ++++--
 .../v201707-py2/controls/service_spec.rb       |  6 ++++--
 .../v201803-py2/controls/pkgs_spec.rb          |  6 ++++--
 .../v201803-py2/controls/service_spec.rb       |  6 ++++--
 .../v201902-py2/controls/pkgs_spec.rb          |  6 ++++--
 .../v201902-py2/controls/service_spec.rb       |  6 ++++--
 .../v201902-py3/controls/pkgs_spec.rb          |  6 ++++--
 .../v201902-py3/controls/service_spec.rb       |  6 ++++--
 9 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index d26bf7c..cd22054 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,24 +1,24 @@
+# frozen_string_literal: true
+
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/trusty64"
-  config.vm.hostname = "salt"
-  config.vm.synced_folder "./", "/srv/salt", id: "vagrant-root"
+  config.vm.box = 'ubuntu/trusty64'
+  config.vm.hostname = 'salt'
+  config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root'
 
   config.ssh.forward_agent = true
 
   config.vm.provider :virtualbox do |vb|
     # Use VBoxManage to customize the VM. For example to change memory:
-    vb.customize ["modifyvm", :id, "--memory", "1024"]
-  end
-  if Vagrant.has_plugin?("vagrant-cachier")
-    config.cache.scope = :box
+    vb.customize ['modifyvm', :id, '--memory', '1024']
   end
+  config.cache.scope = :box if Vagrant.has_plugin?('vagrant-cachier')
 
   # Set up salt-master and minion
-  config.vm.provision "shell", path: "dev/setup-salt.sh"
+  config.vm.provision 'shell', path: 'dev/setup-salt.sh'
 end
diff --git a/test/integration/v201707-py2/controls/pkgs_spec.rb b/test/integration/v201707-py2/controls/pkgs_spec.rb
index 5ef8347..2d09b69 100644
--- a/test/integration/v201707-py2/controls/pkgs_spec.rb
+++ b/test/integration/v201707-py2/controls/pkgs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -14,10 +16,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }
diff --git a/test/integration/v201707-py2/controls/service_spec.rb b/test/integration/v201707-py2/controls/service_spec.rb
index d0255e6..27f8ae5 100644
--- a/test/integration/v201707-py2/controls/service_spec.rb
+++ b/test/integration/v201707-py2/controls/service_spec.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }
diff --git a/test/integration/v201803-py2/controls/pkgs_spec.rb b/test/integration/v201803-py2/controls/pkgs_spec.rb
index 37f5aae..f9e748b 100644
--- a/test/integration/v201803-py2/controls/pkgs_spec.rb
+++ b/test/integration/v201803-py2/controls/pkgs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -9,10 +11,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }
diff --git a/test/integration/v201803-py2/controls/service_spec.rb b/test/integration/v201803-py2/controls/service_spec.rb
index d0255e6..27f8ae5 100644
--- a/test/integration/v201803-py2/controls/service_spec.rb
+++ b/test/integration/v201803-py2/controls/service_spec.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }
diff --git a/test/integration/v201902-py2/controls/pkgs_spec.rb b/test/integration/v201902-py2/controls/pkgs_spec.rb
index a5ed397..eceafb0 100644
--- a/test/integration/v201902-py2/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py2/controls/pkgs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -13,10 +15,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }
diff --git a/test/integration/v201902-py2/controls/service_spec.rb b/test/integration/v201902-py2/controls/service_spec.rb
index d0255e6..27f8ae5 100644
--- a/test/integration/v201902-py2/controls/service_spec.rb
+++ b/test/integration/v201902-py2/controls/service_spec.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }
diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb
index 99b1b27..a840026 100644
--- a/test/integration/v201902-py3/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py3/controls/pkgs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 version =
   case platform[:family]
   when 'redhat'
@@ -18,10 +20,10 @@ version =
 control 'salt packages' do
   title 'should be installed'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe package(p) do
       it { should be_installed }
       its('version') { should eq version }
diff --git a/test/integration/v201902-py3/controls/service_spec.rb b/test/integration/v201902-py3/controls/service_spec.rb
index d0255e6..27f8ae5 100644
--- a/test/integration/v201902-py3/controls/service_spec.rb
+++ b/test/integration/v201902-py3/controls/service_spec.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 control 'salt services' do
   title 'should be running'
 
-  %w(
+  %w[
     salt-master
     salt-minion
-  ).each do |p|
+  ].each do |p|
     describe service(p) do
       it { should be_enabled }
       it { should be_running }

From 4ea85e85d11885960431e3d66db6c656e9d3044e Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 11 Oct 2019 20:28:03 +0100
Subject: [PATCH 14/42] ci(travis): merge `rubocop` linter into main `lint` job

* Semi-automated using https://github.com/myii/ssf-formula/pull/65
---
 .travis.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7b4f50..3841a83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,17 +21,14 @@ stages:
   - name: release
     if: branch = master AND type != pull_request
 jobs:
-  allow_failures:
-    - env: Lint_rubocop
-  fast_finish: true
   include:
     ## Define the test stage that runs the linters (and testing matrix, if applicable)
 
-    # Run all of the linters in a single job (except `rubocop`)
+    # Run all of the linters in a single job
     - language: node_js
       node_js: lts/*
       env: Lint
-      name: 'Lint: salt-lint, yamllint & commitlint'
+      name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
       before_install: skip
       script:
         # Install and run `salt-lint`
@@ -42,21 +39,13 @@ jobs:
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
         - yamllint -s .
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d
         # Install and run `commitlint`
         - npm install @commitlint/config-conventional -D
         - npm install @commitlint/travis-cli -D
         - commitlint-travis
-    # Run the `rubocop` linter in a separate job that is allowed to fail
-    # Once these lint errors are fixed, this can be merged into a single job
-    - language: node_js
-      node_js: lts/*
-      env: Lint_rubocop
-      name: 'Lint: rubocop'
-      before_install: skip
-      script:
-        # Install and run `rubocop`
-        - gem install rubocop
-        - rubocop -d
 
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with

From fda4c2d64f7698824d5f9475b3c383382470fc44 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Fri, 11 Oct 2019 19:50:50 +0000
Subject: [PATCH 15/42] chore(release): 0.59.5 [skip ci]

## [0.59.5](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5) (2019-10-11)

### Bug Fixes

* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/salt-formula/commit/62f82a4))

### Continuous Integration

* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/64c6ba9))
* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/4ea85e8))
---
 AUTHORS.md         |  4 ++--
 CHANGELOG.md       | 13 +++++++++++++
 FORMULA            |  2 +-
 docs/AUTHORS.rst   |  4 ++--
 docs/CHANGELOG.rst | 16 ++++++++++++++++
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 05f8cca..5f3651c 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -7,7 +7,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|98
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|42
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|44
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
@@ -106,4 +106,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c8d069..d05f2a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.59.5](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5) (2019-10-11)
+
+
+### Bug Fixes
+
+* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/salt-formula/commit/62f82a4))
+
+
+### Continuous Integration
+
+* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/64c6ba9))
+* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/4ea85e8))
+
 ## [0.59.4](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4) (2019-10-10)
 
 
diff --git a/FORMULA b/FORMULA
index e6b7404..1fa05ef 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.4
+version: 0.59.5
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 5d9c323..6cf3add 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 42
+     - 44
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
      - `@iggy <https://github.com/iggy>`_
      - 22
@@ -314,4 +314,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-10.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-11.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 3356380..bbe81ed 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,22 @@
 Changelog
 =========
 
+`0.59.5 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5>`_ (2019-10-11)
+---------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/62f82a4>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/64c6ba9>`_\ )
+* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/4ea85e8>`_\ )
+
 `0.59.4 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4>`_ (2019-10-10)
 ---------------------------------------------------------------------------------------------------------
 

From 4787ce7ff888c994f0a4cc38e511b437c9365e4b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 11 Oct 2019 20:55:39 +0100
Subject: [PATCH 16/42] test(pkgs_spec): reset version from `2019.2.1` back to
 `2019.2.0`

* https://groups.google.com/forum/#!msg/salt-announce/a2kXUwwakqQ/f4sdBQpNDAAJ
---
 test/integration/v201902-py2/controls/pkgs_spec.rb | 4 ++--
 test/integration/v201902-py3/controls/pkgs_spec.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/v201902-py2/controls/pkgs_spec.rb b/test/integration/v201902-py2/controls/pkgs_spec.rb
index eceafb0..718ddda 100644
--- a/test/integration/v201902-py2/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py2/controls/pkgs_spec.rb
@@ -3,13 +3,13 @@
 version =
   case platform[:family]
   when 'redhat'
-    '2019.2.1-1.el7'
+    '2019.2.0-1.el7'
   when 'fedora'
     '2019.2.0-1.fc30'
   when 'suse'
     '2019.2.0-lp151.5.3.1'
   when 'debian'
-    '2019.2.1+ds-1'
+    '2019.2.0+ds-1'
   end
 
 control 'salt packages' do
diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb
index a840026..cbf0927 100644
--- a/test/integration/v201902-py3/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py3/controls/pkgs_spec.rb
@@ -7,14 +7,14 @@ version =
     when 'amazon'
       '2019.2.0-1.el7'
     when 'centos'
-      '2019.2.1-1.el7'
+      '2019.2.0-2.el7'
     end
   when 'fedora'
     '2019.2.0-1.fc30'
   when 'suse'
     '2019.2.0-lp151.5.3.1'
   when 'debian'
-    '2019.2.1+ds-1'
+    '2019.2.0+ds-1'
   end
 
 control 'salt packages' do

From d4b2387d33c414b6e2edb1f949390edacfcf2110 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Fri, 11 Oct 2019 21:06:06 +0000
Subject: [PATCH 17/42] chore(release): 0.59.6 [skip ci]

## [0.59.6](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.5...v0.59.6) (2019-10-11)

### Tests

* **pkgs_spec:** reset version from `2019.2.1` back to `2019.2.0` ([](https://github.com/saltstack-formulas/salt-formula/commit/4787ce7))
---
 AUTHORS.md         | 2 +-
 CHANGELOG.md       | 7 +++++++
 FORMULA            | 2 +-
 docs/AUTHORS.rst   | 2 +-
 docs/CHANGELOG.rst | 9 +++++++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 5f3651c..3a7ef22 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -7,7 +7,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|98
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|44
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|46
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d05f2a3..ca3001a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.59.6](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.5...v0.59.6) (2019-10-11)
+
+
+### Tests
+
+* **pkgs_spec:** reset version from `2019.2.1` back to `2019.2.0` ([](https://github.com/saltstack-formulas/salt-formula/commit/4787ce7))
+
 ## [0.59.5](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5) (2019-10-11)
 
 
diff --git a/FORMULA b/FORMULA
index 1fa05ef..ca4c94e 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.5
+version: 0.59.6
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 6cf3add..d686360 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 44
+     - 46
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
      - `@iggy <https://github.com/iggy>`_
      - 22
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index bbe81ed..d586536 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog
 =========
 
+`0.59.6 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.5...v0.59.6>`_ (2019-10-11)
+---------------------------------------------------------------------------------------------------------
+
+Tests
+^^^^^
+
+
+* **pkgs_spec:** reset version from ``2019.2.1`` back to ``2019.2.0`` (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/4787ce7>`_\ )
+
 `0.59.5 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5>`_ (2019-10-11)
 ---------------------------------------------------------------------------------------------------------
 

From 924817b498baf58ee4b06f48dfba46353e84a50d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 14 Oct 2019 11:38:24 +0100
Subject: [PATCH 18/42] docs(readme): update link to `CONTRIBUTING` [skip ci]

---
 docs/README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.rst b/docs/README.rst
index 4ca3d74..517d135 100644
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -37,7 +37,7 @@ Contributing to this repo
 
 **Commit message formatting is significant!!**
 
-Please see :ref:`How to contribute <CONTRIBUTING>` for more details.
+Please see `How to contribute <https://github.com/saltstack-formulas/.github/blob/master/CONTRIBUTING.rst>`_ for more details.
 
 Available states
 ----------------

From 78d0fee19753de748477f890cc3a87c080030060 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 14 Oct 2019 12:32:19 +0100
Subject: [PATCH 19/42] docs(contributing): remove to use org-level file
 instead [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/70
---
 docs/CONTRIBUTING.rst | 159 ------------------------------------------
 1 file changed, 159 deletions(-)
 delete mode 100644 docs/CONTRIBUTING.rst

diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
deleted file mode 100644
index b7da8f4..0000000
--- a/docs/CONTRIBUTING.rst
+++ /dev/null
@@ -1,159 +0,0 @@
-.. _contributing:
-
-How to contribute
-=================
-
-This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one.
-What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo.
-It also covers how to contribute to this *formula's documentation*.
-
-.. contents:: **Table of Contents**
-
-Overview
---------
-
-Submitting a pull request is more than just code!
-To achieve a quality product, the *tests* and *documentation* need to be updated as well.
-An excellent pull request will include these in the changes, wherever relevant.
-
-Commit message formatting
--------------------------
-
-Since every type of change requires making Git commits,
-we will start by covering the importance of ensuring that all of your commit
-messages are in the correct format.
-
-Automation of multiple processes
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This formula uses `semantic-release <https://github.com/semantic-release/semantic-release>`_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog.
-The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation.
-
-Full details are available in the upstream docs regarding the `Angular Commit Message Conventions <https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines>`_.
-The key factor is that the first line of the commit message must follow this format:
-
-.. code-block::
-
-   type(scope): subject
-
-
-* E.g. ``docs(contributing): add commit message formatting instructions``.
-
-Besides the version bump, the changelog and release notes are formatted accordingly.
-So based on the example above:
-
-..
-
-   .. raw:: html
-
-      <h3>Documentation</h3>
-
-   * **contributing:** add commit message formatting instructions
-
-
-* The ``type`` translates into a ``Documentation`` sub-heading.
-* The ``(scope):`` will be shown in bold text without the brackets.
-* The ``subject`` follows the ``scope`` as standard text.
-
-Linting commit messages in Travis CI
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This formula uses `commitlint <https://github.com/conventional-changelog/commitlint>`_ for checking commit messages during CI testing.
-This ensures that they are in accordance with the ``semantic-release`` settings.
-
-For more details about the default settings, refer back to the ``commitlint`` `reference rules <https://conventional-changelog.github.io/commitlint/#/reference-rules>`_.
-
-Relationship between commit type and version bump
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This formula applies some customisations to the defaults, as outlined in the table below,
-based upon the `type <https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type>`_ of the commit:
-
-.. list-table::
-   :name: commit-type-vs-version-bump
-   :header-rows: 1
-   :stub-columns: 0
-   :widths: 1,2,3,1,1
-
-   * - Type
-     - Heading
-     - Description
-     - Bump (default)
-     - Bump (custom)
-   * - ``build``
-     - Build System
-     - Changes related to the build system
-     - –
-     -
-   * - ``chore``
-     - –
-     - Changes to the build process or auxiliary tools and libraries such as
-       documentation generation
-     - –
-     -
-   * - ``ci``
-     - Continuous Integration
-     - Changes to the continuous integration configuration
-     - –
-     -
-   * - ``docs``
-     - Documentation
-     - Documentation only changes
-     - –
-     - 0.0.1
-   * - ``feat``
-     - Features
-     - A new feature
-     - 0.1.0
-     -
-   * - ``fix``
-     - Bug Fixes
-     - A bug fix
-     - 0.0.1
-     -
-   * - ``perf``
-     - Performance Improvements
-     - A code change that improves performance
-     - 0.0.1
-     -
-   * - ``refactor``
-     - Code Refactoring
-     - A code change that neither fixes a bug nor adds a feature
-     - –
-     - 0.0.1
-   * - ``revert``
-     - Reverts
-     - A commit used to revert a previous commit
-     - –
-     - 0.0.1
-   * - ``style``
-     - Styles
-     - Changes that do not affect the meaning of the code (white-space,
-       formatting, missing semi-colons, etc.)
-     - –
-     - 0.0.1
-   * - ``test``
-     - Tests
-     - Adding missing or correcting existing tests
-     - –
-     - 0.0.1
-
-Use ``BREAKING CHANGE`` to trigger a ``major`` version change
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used.
-This will be appended to the changelog and release notes as well.
-To preserve good formatting of these notes, the following format is prescribed:
-
-* ``BREAKING CHANGE: <explanation in paragraph format>.``
-
-An example of that:
-
-.. code-block:: git
-
-   ...
-
-   BREAKING CHANGE: With the removal of all of the `.sls` files under
-   `template package`, this formula no longer supports the installation of
-   packages.
-

From 4cbf0b2dc8c34e39897f11983b4863167d99790b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 23 Oct 2019 17:38:01 +0100
Subject: [PATCH 20/42] ci(travis): update `salt-lint` config for `v0.0.10`
 [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/82
---
 .salt-lint | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.salt-lint b/.salt-lint
index a539954..3715677 100644
--- a/.salt-lint
+++ b/.salt-lint
@@ -2,6 +2,7 @@
 # vim: ft=yaml
 ---
 exclude_paths: []
+rules: {}
 skip_list:
   # Using `salt-lint` for linting other files as well, such as Jinja macros/templates
   - 205  # Use ".sls" as a Salt State file extension

From acbc238877e3d2b1d3d3689d19c295d3a1abfd70 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 29 Oct 2019 11:33:56 +0000
Subject: [PATCH 21/42] test(pkgs_spec): update for `2019.2.2` release

* https://docs.saltstack.com/en/latest/topics/releases/2019.2.2.html
---
 test/integration/v201902-py2/controls/pkgs_spec.rb | 8 ++------
 test/integration/v201902-py3/controls/pkgs_spec.rb | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/integration/v201902-py2/controls/pkgs_spec.rb b/test/integration/v201902-py2/controls/pkgs_spec.rb
index 718ddda..2c57bc6 100644
--- a/test/integration/v201902-py2/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py2/controls/pkgs_spec.rb
@@ -3,13 +3,9 @@
 version =
   case platform[:family]
   when 'redhat'
-    '2019.2.0-1.el7'
-  when 'fedora'
-    '2019.2.0-1.fc30'
-  when 'suse'
-    '2019.2.0-lp151.5.3.1'
+    '2019.2.2-1.el7'
   when 'debian'
-    '2019.2.0+ds-1'
+    '2019.2.2+ds-1'
   end
 
 control 'salt packages' do
diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb
index cbf0927..f25bba5 100644
--- a/test/integration/v201902-py3/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py3/controls/pkgs_spec.rb
@@ -5,16 +5,16 @@ version =
   when 'redhat'
     case platform[:name]
     when 'amazon'
-      '2019.2.0-1.el7'
+      '2019.2.2-1.el7'
     when 'centos'
-      '2019.2.0-2.el7'
+      '2019.2.2-1.el8'
     end
   when 'fedora'
-    '2019.2.0-1.fc30'
+    '2019.2.1rc0-3.fc31'
   when 'suse'
     '2019.2.0-lp151.5.3.1'
   when 'debian'
-    '2019.2.0+ds-1'
+    '2019.2.2+ds-1'
   end
 
 control 'salt packages' do

From b6e3a832295b70ff3609cd3a022d16239e416c2d Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 29 Oct 2019 21:40:51 +0000
Subject: [PATCH 22/42] ci(kitchen+travis): upgrade matrix after `2019.2.2`
 release

* Automated using https://github.com/myii/ssf-formula/pull/86
---
 .travis.yml | 16 +++++++---------
 kitchen.yml | 50 +++++++++++++-------------------------------------
 2 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3841a83..b58ebdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ jobs:
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
-        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
+        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
                        | xargs -I {} salt-lint {}
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
@@ -60,22 +60,20 @@ jobs:
     - env: INSTANCE=v201707-py2-centos-6-2017-7-py2
     # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
     # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
-    # - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
+    - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
     # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
     - env: INSTANCE=v201803-py2-centos-7-2018-3-py2
-    - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
+    # - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
     # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
-    - env: INSTANCE=v201902-py2-debian-9-2019-2-py2
     - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
     # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
-    # - env: INSTANCE=v201902-py2-opensuse-leap-15-2019-2-py2
-    # - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
+    - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
     # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
+    - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
     # - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
     # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
-    - env: INSTANCE=v201902-py3-fedora-30-2019-2-py3
-    - env: INSTANCE=v201902-py3-opensuse-leap-15-2019-2-py3
+    # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
+    - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: release
diff --git a/kitchen.yml b/kitchen.yml
index fe3c661..db09584 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -49,30 +49,12 @@ platforms:
       run_command: /usr/lib/systemd/systemd
 
   ## SALT `2019.2`
-  - name: debian-9-2019-2-py2
-    driver:
-      image: netmanagers/salt-2019.2-py2:debian-9
   - name: ubuntu-1804-2019-2-py2
     driver:
       image: netmanagers/salt-2019.2-py2:ubuntu-18.04
   - name: centos-7-2019-2-py2
     driver:
       image: netmanagers/salt-2019.2-py2:centos-7
-  - name: opensuse-leap-15-2019-2-py2
-    driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip
-        - systemctl enable sshd.service
-      run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python2 git 2019.2
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: amazonlinux-2-2019-2-py2
     driver:
       image: netmanagers/salt-2019.2-py2:amazonlinux-2
@@ -80,30 +62,26 @@ platforms:
     driver:
       image: netmanagers/salt-2019.2-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
+  - name: debian-10-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:debian-10
   - name: debian-9-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:debian-9
   - name: ubuntu-1804-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:ubuntu-18.04
-  - name: centos-7-2019-2-py3
+  - name: centos-8-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:centos-7
-  - name: fedora-30-2019-2-py3
+      image: netmanagers/salt-2019.2-py3:centos-8
+  - name: fedora-31-2019-2-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:fedora-30
-  - name: opensuse-leap-15-2019-2-py3
+      image: netmanagers/salt-2019.2-py3:fedora-31
+  - name: opensuse-leap-151-2019-2-py3
     driver:
-      image: opensuse/leap:15
-      provision_command:
-        # yamllint disable-line rule:line-length
-        - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip
-        - systemctl enable sshd.service
+      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
       run_command: /usr/lib/systemd/systemd
-    provisioner:
-      salt_bootstrap_options: -XdPfrq -x python3 git 2019.2
-      salt_install: bootstrap
-    # Workaround to avoid intermittent failures on `opensuse-leap-15`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
@@ -129,11 +107,11 @@ verifier:
 suites:
   - name: v201902-py3
     includes:
+      - debian-10-2019-2-py3
       - debian-9-2019-2-py3
       - ubuntu-1804-2019-2-py3
-      - centos-7-2019-2-py3
-      - fedora-30-2019-2-py3
-      - opensuse-leap-15-2019-2-py3
+      - centos-8-2019-2-py3
+      - opensuse-leap-151-2019-2-py3
     provisioner:
       state_top:
         base:
@@ -155,10 +133,8 @@ suites:
         - path: test/integration/v201902-py3
   - name: v201902-py2
     includes:
-      - debian-9-2019-2-py2
       - ubuntu-1804-2019-2-py2
       - centos-7-2019-2-py2
-      - opensuse-leap-15-2019-2-py2
       - amazonlinux-2-2019-2-py2
       - arch-base-latest-2019-2-py2
     provisioner:

From d7c09c753b1e0089e1d9bf4306f51a33e540296a Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Tue, 29 Oct 2019 22:42:16 +0000
Subject: [PATCH 23/42] chore(release): 0.59.7 [skip ci]

## [0.59.7](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.6...v0.59.7) (2019-10-29)

### Continuous Integration

* **kitchen+travis:** upgrade matrix after `2019.2.2` release ([](https://github.com/saltstack-formulas/salt-formula/commit/b6e3a83))
* **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/4cbf0b2))

### Documentation

* **contributing:** remove to use org-level file instead [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/78d0fee))
* **readme:** update link to `CONTRIBUTING` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/924817b))

### Tests

* **pkgs_spec:** update for `2019.2.2` release ([](https://github.com/saltstack-formulas/salt-formula/commit/acbc238))
---
 AUTHORS.md         |  4 ++--
 CHANGELOG.md       | 19 +++++++++++++++++++
 FORMULA            |  2 +-
 docs/AUTHORS.rst   |  4 ++--
 docs/CHANGELOG.rst | 23 +++++++++++++++++++++++
 5 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 3a7ef22..540bf33 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -7,7 +7,7 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|98
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|46
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|54
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
@@ -106,4 +106,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-29.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca3001a..d8384ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.59.7](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.6...v0.59.7) (2019-10-29)
+
+
+### Continuous Integration
+
+* **kitchen+travis:** upgrade matrix after `2019.2.2` release ([](https://github.com/saltstack-formulas/salt-formula/commit/b6e3a83))
+* **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/4cbf0b2))
+
+
+### Documentation
+
+* **contributing:** remove to use org-level file instead [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/78d0fee))
+* **readme:** update link to `CONTRIBUTING` [skip ci] ([](https://github.com/saltstack-formulas/salt-formula/commit/924817b))
+
+
+### Tests
+
+* **pkgs_spec:** update for `2019.2.2` release ([](https://github.com/saltstack-formulas/salt-formula/commit/acbc238))
+
 ## [0.59.6](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.5...v0.59.6) (2019-10-11)
 
 
diff --git a/FORMULA b/FORMULA
index ca4c94e..fac3afc 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.6
+version: 0.59.7
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index d686360..00f1b42 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 46
+     - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
      - `@iggy <https://github.com/iggy>`_
      - 22
@@ -314,4 +314,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-11.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-29.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index d586536..0a391f5 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,29 @@
 Changelog
 =========
 
+`0.59.7 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.6...v0.59.7>`_ (2019-10-29)
+---------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen+travis:** upgrade matrix after ``2019.2.2`` release (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/b6e3a83>`_\ )
+* **travis:** update ``salt-lint`` config for ``v0.0.10`` [skip ci] (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/4cbf0b2>`_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **contributing:** remove to use org-level file instead [skip ci] (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/78d0fee>`_\ )
+* **readme:** update link to ``CONTRIBUTING`` [skip ci] (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/924817b>`_\ )
+
+Tests
+^^^^^
+
+
+* **pkgs_spec:** update for ``2019.2.2`` release (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/acbc238>`_\ )
+
 `0.59.6 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.5...v0.59.6>`_ (2019-10-11)
 ---------------------------------------------------------------------------------------------------------
 

From 67e110973b9ddde1ea07889e8e40de97e29c96db Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 31 Oct 2019 10:35:46 +0000
Subject: [PATCH 24/42] fix(release.config.js): use full commit hash in commit
 link [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/89
---
 .travis.yml       | 22 ++++++++++++----------
 release.config.js |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b58ebdf..7e05f3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,8 +43,8 @@ jobs:
         - gem install rubocop
         - rubocop -d
         # Install and run `commitlint`
-        - npm install @commitlint/config-conventional -D
-        - npm install @commitlint/travis-cli -D
+        - npm i -D @commitlint/config-conventional
+                   @commitlint/travis-cli
         - commitlint-travis
 
     ## Define the rest of the matrix based on Kitchen testing
@@ -60,19 +60,21 @@ jobs:
     - env: INSTANCE=v201707-py2-centos-6-2017-7-py2
     # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
     # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
-    - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
+    # - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
     # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
     - env: INSTANCE=v201803-py2-centos-7-2018-3-py2
-    # - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
+    - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
     # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
+    - env: INSTANCE=v201902-py2-debian-9-2019-2-py2
     - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
     # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
-    - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
+    # - env: INSTANCE=v201902-py2-opensuse-leap-151-2019-2-py2
+    # - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
     # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
-    - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
-    # - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
+    # - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
     # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
     # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
+    - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3
     - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
 
     ## Define the release stage that runs `semantic-release`
@@ -89,9 +91,9 @@ jobs:
         - maintainer contributor
 
         # Install all dependencies required for `semantic-release`
-        - npm install @semantic-release/changelog@3 -D
-        - npm install @semantic-release/exec@3 -D
-        - npm install @semantic-release/git@7 -D
+        - npm i -D @semantic-release/changelog@3
+                   @semantic-release/exec@3
+                   @semantic-release/git@7
       deploy:
         provider: script
         skip_cleanup: true
diff --git a/release.config.js b/release.config.js
index afa0cb1..6af7aa8 100644
--- a/release.config.js
+++ b/release.config.js
@@ -63,7 +63,7 @@ module.exports = {
           }
 
           if (typeof commit.hash === `string`) {
-              commit.hash = commit.hash.substring(0, 7)
+              commit.shortHash = commit.hash.substring(0, 7)
           }
 
           if (typeof commit.subject === `string`) {

From ef7e1c1e7b8eb97fcb859a85d919d78f553f82ed Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 2 Nov 2019 08:43:35 +0000
Subject: [PATCH 25/42] perf(travis): improve `salt-lint` invocation [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/90
---
 .travis.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7e05f3b..c9ae853 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ jobs:
         # Install and run `salt-lint`
         - pip install --user salt-lint
         - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
-                       | xargs -I {} salt-lint {}
+                       | xargs salt-lint
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
@@ -60,21 +60,19 @@ jobs:
     - env: INSTANCE=v201707-py2-centos-6-2017-7-py2
     # - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
     # - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
-    # - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
+    - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
     # - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
     - env: INSTANCE=v201803-py2-centos-7-2018-3-py2
-    - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
+    # - env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
     # - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
-    - env: INSTANCE=v201902-py2-debian-9-2019-2-py2
     - env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
     # - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
-    # - env: INSTANCE=v201902-py2-opensuse-leap-151-2019-2-py2
-    # - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
+    - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
     # - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
-    # - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
+    - env: INSTANCE=v201902-py3-debian-10-2019-2-py3
+    # - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
     # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
     # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
-    - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3
     - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
 
     ## Define the release stage that runs `semantic-release`

From 85593f555e95928cfd0bafdc01ca4445baddd194 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 13 Nov 2019 16:53:13 +0000
Subject: [PATCH 26/42] ci(travis): use build config validation (beta) [skip
 ci]

* Automated using https://github.com/myii/ssf-formula/pull/97
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c9ae853..95bdfbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@
 ---
 ## Machine config
 dist: bionic
+version: '~> 1.0'
 sudo: required
 services:
   - docker

From 56c2eb536709ff4b07413656b08a502954e15f97 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sat, 16 Nov 2019 20:10:48 +0000
Subject: [PATCH 27/42] ci(travis): apply changes from build config validation
 [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/98
---
 .travis.yml | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95bdfbc..26f8335 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,18 @@
 # vim: ft=yaml
 ---
 ## Machine config
-dist: bionic
+os: 'linux'
+arch: 'amd64'
+dist: 'bionic'
 version: '~> 1.0'
-sudo: required
-services:
-  - docker
 
 ## Language and cache config
-language: ruby
-cache: bundler
+language: 'ruby'
+cache: 'bundler'
+
+## Services config
+services:
+  - docker
 
 ## Script to run for the test stage
 script:
@@ -19,18 +22,18 @@ script:
 ## Stages and jobs matrix
 stages:
   - test
-  - name: release
-    if: branch = master AND type != pull_request
+  - name: 'release'
+    if: 'branch = master AND type != pull_request'
 jobs:
   include:
     ## Define the test stage that runs the linters (and testing matrix, if applicable)
 
     # Run all of the linters in a single job
-    - language: node_js
-      node_js: lts/*
-      env: Lint
+    - language: 'node_js'
+      node_js: 'lts/*'
+      env: 'Lint'
       name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
-      before_install: skip
+      before_install: 'skip'
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
@@ -77,12 +80,12 @@ jobs:
     - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
 
     ## Define the release stage that runs `semantic-release`
-    - stage: release
-      language: node_js
-      node_js: lts/*
-      env: Release
+    - stage: 'release'
+      language: 'node_js'
+      node_js: 'lts/*'
+      env: 'Release'
       name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
-      before_install: skip
+      before_install: 'skip'
       script:
         # Update `AUTHORS.md`
         - export MAINTAINER_TOKEN=${GH_TOKEN}
@@ -94,8 +97,9 @@ jobs:
                    @semantic-release/exec@3
                    @semantic-release/git@7
       deploy:
-        provider: script
+        provider: 'script'
+        # Using deprecated `skip_cleanup` until `cleanup: false` works reliably
+        # cleanup: false
         skip_cleanup: true
-        script:
-          # Run `semantic-release`
-          - npx semantic-release@15
+        # Run `semantic-release`
+        script: 'npx semantic-release@15'

From 33f69cfb7bd462230547d2cbe91474aeccb91975 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 20 Nov 2019 16:37:37 +0000
Subject: [PATCH 28/42] ci(travis): opt-in to `dpl v2` to complete build config
 validation [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/100
---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26f8335..aaf6d2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,8 +98,9 @@ jobs:
                    @semantic-release/git@7
       deploy:
         provider: 'script'
-        # Using deprecated `skip_cleanup` until `cleanup: false` works reliably
-        # cleanup: false
-        skip_cleanup: true
+        # Opt-in to `dpl v2` to complete the Travis build config validation (beta)
+        # * https://docs.travis-ci.com/user/build-config-validation
+        # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
+        edge: true
         # Run `semantic-release`
         script: 'npx semantic-release@15'

From f4e8ae6871d9788f4b57fabd6e5962a44bf6982c Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 27 Nov 2019 21:06:03 +0000
Subject: [PATCH 29/42] ci(travis): run `shellcheck` during lint job [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/106
---
 .travis.yml                    | 10 +++++++---
 pre-commit_semantic-release.sh |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aaf6d2b..09df14c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,13 +32,13 @@ jobs:
     - language: 'node_js'
       node_js: 'lts/*'
       env: 'Lint'
-      name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
+      name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
       before_install: 'skip'
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
-        - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
-                       | xargs salt-lint
+        - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst
+                        | xargs salt-lint
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
         - pip install --user yamllint>=1.17.0
@@ -46,6 +46,10 @@ jobs:
         # Install and run `rubocop`
         - gem install rubocop
         - rubocop -d
+        # Run `shellcheck` (already pre-installed in Travis)
+        - shellcheck --version
+        - git ls-files -- *.sh *.bash *.ksh
+                        | xargs shellcheck
         # Install and run `commitlint`
         - npm i -D @commitlint/config-conventional
                    @commitlint/travis-cli
diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh
index 9d34d74..ba80535 100755
--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@@ -14,9 +14,9 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
 sudo -H pip install m2r
 
 # Copy and then convert the `.md` docs
-cp *.md docs/
-cd docs/
-m2r --overwrite *.md
+cp ./*.md docs/
+cd docs/ || exit
+m2r --overwrite ./*.md
 
 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst

From 1a27b0ae84a7433120fd82a644d7bfd02da18a40 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 27 Nov 2019 22:03:35 +0000
Subject: [PATCH 30/42] ci(travis): quote pathspecs used with `git ls-files`
 [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/107
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09df14c..52cac27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ jobs:
       script:
         # Install and run `salt-lint`
         - pip install --user salt-lint
-        - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst
+        - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst'
                         | xargs salt-lint
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
@@ -48,7 +48,7 @@ jobs:
         - rubocop -d
         # Run `shellcheck` (already pre-installed in Travis)
         - shellcheck --version
-        - git ls-files -- *.sh *.bash *.ksh
+        - git ls-files -- '*.sh' '*.bash' '*.ksh'
                         | xargs shellcheck
         # Install and run `commitlint`
         - npm i -D @commitlint/config-conventional

From cc3151436cecc921c992c6b520ad951bbd0f867f Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe@spectre.wraith.lan>
Date: Thu, 28 Nov 2019 19:42:14 +0100
Subject: [PATCH 31/42] fix(shellcheck): fix shellcheck error

---
 dev/setup-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/setup-salt.sh b/dev/setup-salt.sh
index 5f2d2e2..6a30b6d 100644
--- a/dev/setup-salt.sh
+++ b/dev/setup-salt.sh
@@ -2,7 +2,7 @@
 
 # use the latest stable Salt from repo.saltstack.com
 wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-sudo echo 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main' > /etc/apt/sources.list.d/saltstack.list
+echo 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main' | sudo tee /etc/apt/sources.list.d/saltstack.list
 
 sudo apt-get update -y
 sudo apt-get install salt-master -y

From 0260cfd2de2c8c12c2306c237caea4c8db2885b7 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 28 Nov 2019 21:05:15 +0000
Subject: [PATCH 32/42] chore(release): 0.59.8 [skip ci]

## [0.59.8](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.7...v0.59.8) (2019-11-28)

### Bug Fixes

* **release.config.js:** use full commit hash in commit link [skip ci] ([67e1109](https://github.com/saltstack-formulas/salt-formula/commit/67e110973b9ddde1ea07889e8e40de97e29c96db))
* **shellcheck:** fix shellcheck error ([cc31514](https://github.com/saltstack-formulas/salt-formula/commit/cc3151436cecc921c992c6b520ad951bbd0f867f))

### Continuous Integration

* **travis:** apply changes from build config validation [skip ci] ([56c2eb5](https://github.com/saltstack-formulas/salt-formula/commit/56c2eb536709ff4b07413656b08a502954e15f97))
* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([33f69cf](https://github.com/saltstack-formulas/salt-formula/commit/33f69cfb7bd462230547d2cbe91474aeccb91975))
* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([1a27b0a](https://github.com/saltstack-formulas/salt-formula/commit/1a27b0ae84a7433120fd82a644d7bfd02da18a40))
* **travis:** run `shellcheck` during lint job [skip ci] ([f4e8ae6](https://github.com/saltstack-formulas/salt-formula/commit/f4e8ae6871d9788f4b57fabd6e5962a44bf6982c))
* **travis:** use build config validation (beta) [skip ci] ([85593f5](https://github.com/saltstack-formulas/salt-formula/commit/85593f555e95928cfd0bafdc01ca4445baddd194))

### Performance Improvements

* **travis:** improve `salt-lint` invocation [skip ci] ([ef7e1c1](https://github.com/saltstack-formulas/salt-formula/commit/ef7e1c1e7b8eb97fcb859a85d919d78f553f82ed))
---
 AUTHORS.md         |  4 ++--
 CHANGELOG.md       | 22 ++++++++++++++++++++++
 FORMULA            |  2 +-
 docs/AUTHORS.rst   |  8 ++++----
 docs/CHANGELOG.rst | 26 ++++++++++++++++++++++++++
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 540bf33..5c3ae5b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -6,8 +6,8 @@ Avatar|Contributor|Contributions
 :-:|---|:-:
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|98
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|62
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|54
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
@@ -106,4 +106,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-29.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-11-28.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8384ff..b44ebf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.59.8](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.7...v0.59.8) (2019-11-28)
+
+
+### Bug Fixes
+
+* **release.config.js:** use full commit hash in commit link [skip ci] ([67e1109](https://github.com/saltstack-formulas/salt-formula/commit/67e110973b9ddde1ea07889e8e40de97e29c96db))
+* **shellcheck:** fix shellcheck error ([cc31514](https://github.com/saltstack-formulas/salt-formula/commit/cc3151436cecc921c992c6b520ad951bbd0f867f))
+
+
+### Continuous Integration
+
+* **travis:** apply changes from build config validation [skip ci] ([56c2eb5](https://github.com/saltstack-formulas/salt-formula/commit/56c2eb536709ff4b07413656b08a502954e15f97))
+* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([33f69cf](https://github.com/saltstack-formulas/salt-formula/commit/33f69cfb7bd462230547d2cbe91474aeccb91975))
+* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([1a27b0a](https://github.com/saltstack-formulas/salt-formula/commit/1a27b0ae84a7433120fd82a644d7bfd02da18a40))
+* **travis:** run `shellcheck` during lint job [skip ci] ([f4e8ae6](https://github.com/saltstack-formulas/salt-formula/commit/f4e8ae6871d9788f4b57fabd6e5962a44bf6982c))
+* **travis:** use build config validation (beta) [skip ci] ([85593f5](https://github.com/saltstack-formulas/salt-formula/commit/85593f555e95928cfd0bafdc01ca4445baddd194))
+
+
+### Performance Improvements
+
+* **travis:** improve `salt-lint` invocation [skip ci] ([ef7e1c1](https://github.com/saltstack-formulas/salt-formula/commit/ef7e1c1e7b8eb97fcb859a85d919d78f553f82ed))
+
 ## [0.59.7](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.6...v0.59.7) (2019-10-29)
 
 
diff --git a/FORMULA b/FORMULA
index fac3afc..4d89776 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.7
+version: 0.59.8
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 00f1b42..4345173 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -19,11 +19,11 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
      - `@gravyboat <https://github.com/gravyboat>`_
      - 71
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
-     - `@nmadhok <https://github.com/nmadhok>`_
-     - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
+     - 62
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
+     - `@nmadhok <https://github.com/nmadhok>`_
      - 54
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
      - `@iggy <https://github.com/iggy>`_
@@ -314,4 +314,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-29.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-11-28.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 0a391f5..e60b75d 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,32 @@
 Changelog
 =========
 
+`0.59.8 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.7...v0.59.8>`_ (2019-11-28)
+---------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **release.config.js:** use full commit hash in commit link [skip ci] (\ `67e1109 <https://github.com/saltstack-formulas/salt-formula/commit/67e110973b9ddde1ea07889e8e40de97e29c96db>`_\ )
+* **shellcheck:** fix shellcheck error (\ `cc31514 <https://github.com/saltstack-formulas/salt-formula/commit/cc3151436cecc921c992c6b520ad951bbd0f867f>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **travis:** apply changes from build config validation [skip ci] (\ `56c2eb5 <https://github.com/saltstack-formulas/salt-formula/commit/56c2eb536709ff4b07413656b08a502954e15f97>`_\ )
+* **travis:** opt-in to ``dpl v2`` to complete build config validation [skip ci] (\ `33f69cf <https://github.com/saltstack-formulas/salt-formula/commit/33f69cfb7bd462230547d2cbe91474aeccb91975>`_\ )
+* **travis:** quote pathspecs used with ``git ls-files`` [skip ci] (\ `1a27b0a <https://github.com/saltstack-formulas/salt-formula/commit/1a27b0ae84a7433120fd82a644d7bfd02da18a40>`_\ )
+* **travis:** run ``shellcheck`` during lint job [skip ci] (\ `f4e8ae6 <https://github.com/saltstack-formulas/salt-formula/commit/f4e8ae6871d9788f4b57fabd6e5962a44bf6982c>`_\ )
+* **travis:** use build config validation (beta) [skip ci] (\ `85593f5 <https://github.com/saltstack-formulas/salt-formula/commit/85593f555e95928cfd0bafdc01ca4445baddd194>`_\ )
+
+Performance Improvements
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **travis:** improve ``salt-lint`` invocation [skip ci] (\ `ef7e1c1 <https://github.com/saltstack-formulas/salt-formula/commit/ef7e1c1e7b8eb97fcb859a85d919d78f553f82ed>`_\ )
+
 `0.59.7 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.6...v0.59.7>`_ (2019-10-29)
 ---------------------------------------------------------------------------------------------------------
 

From 6da3d0d9350bb6083f14073ee176fbd56fbad5ee Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 3 Dec 2019 21:59:00 +0000
Subject: [PATCH 33/42] test(pkgs_spec): update for new `opensuse` package

* https://travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203#L1619-L1632
---
 test/integration/v201902-py3/controls/pkgs_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb
index f25bba5..cf4e765 100644
--- a/test/integration/v201902-py3/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py3/controls/pkgs_spec.rb
@@ -12,7 +12,7 @@ version =
   when 'fedora'
     '2019.2.1rc0-3.fc31'
   when 'suse'
-    '2019.2.0-lp151.5.3.1'
+    '2019.2.0-lp151.5.6.1'
   when 'debian'
     '2019.2.2+ds-1'
   end

From 1c03133e34d5485efba1a7393660435a601513bd Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Tue, 3 Dec 2019 22:31:08 +0000
Subject: [PATCH 34/42] chore(release): 0.59.9 [skip ci]

## [0.59.9](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.8...v0.59.9) (2019-12-03)

### Tests

* **pkgs_spec:** update for new `opensuse` package ([6da3d0d](https://github.com/saltstack-formulas/salt-formula/commit/6da3d0d9350bb6083f14073ee176fbd56fbad5ee)), closes [/travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203#L1619-L1632](https://github.com//travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203/issues/L1619-L1632)
---
 AUTHORS.md         | 2 +-
 CHANGELOG.md       | 7 +++++++
 FORMULA            | 2 +-
 docs/AUTHORS.rst   | 2 +-
 docs/CHANGELOG.rst | 9 +++++++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 5c3ae5b..55e7aee 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -106,4 +106,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-11-28.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-03.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b44ebf3..5f9fc93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.59.9](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.8...v0.59.9) (2019-12-03)
+
+
+### Tests
+
+* **pkgs_spec:** update for new `opensuse` package ([6da3d0d](https://github.com/saltstack-formulas/salt-formula/commit/6da3d0d9350bb6083f14073ee176fbd56fbad5ee)), closes [/travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203#L1619-L1632](https://github.com//travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203/issues/L1619-L1632)
+
 ## [0.59.8](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.7...v0.59.8) (2019-11-28)
 
 
diff --git a/FORMULA b/FORMULA
index 4d89776..160c0ce 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.8
+version: 0.59.9
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 4345173..4725786 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -314,4 +314,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-11-28.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-12-03.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index e60b75d..b48b96f 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog
 =========
 
+`0.59.9 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.8...v0.59.9>`_ (2019-12-03)
+---------------------------------------------------------------------------------------------------------
+
+Tests
+^^^^^
+
+
+* **pkgs_spec:** update for new ``opensuse`` package (\ `6da3d0d <https://github.com/saltstack-formulas/salt-formula/commit/6da3d0d9350bb6083f14073ee176fbd56fbad5ee>`_\ ), closes `/travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203#L1619-L1632 <https://github.com//travis-ci.com/saltstack-formulas/salt-formula/jobs/261961203/issues/L1619-L1632>`_
+
 `0.59.8 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.7...v0.59.8>`_ (2019-11-28)
 ---------------------------------------------------------------------------------------------------------
 

From 9362277f2a61762b818dc775b30f15f93733efd5 Mon Sep 17 00:00:00 2001
From: nb <none@nowhere.nw>
Date: Fri, 7 Jun 2019 15:40:05 +1100
Subject: [PATCH 35/42] feat(per-formula-opts): configure git.latest state per
 formula

---
 pillar.example      | 8 ++++++++
 salt/formulas.jinja | 3 ++-
 salt/formulas.sls   | 7 +++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pillar.example b/pillar.example
index b91c483..550cff5 100644
--- a/pillar.example
+++ b/pillar.example
@@ -424,10 +424,18 @@ salt_formulas:
     base:
       - salt-formula
       - postfix-formula
+      - nginx-formula:  # We can also override some options per formula
+          rev: 'v1.1.0'  # Pin a version
+      - openssh-formula:
+          rev: '3e01ad8'  # or pin a commit id
     dev:
       - salt-formula
       - postfix-formula
       - openssh-formula
+      - nginx-formula:
+          # You can also pull from another location
+          name: 'https://github.com/another-fork-location/salt-formula.git'
+          rev: 'feat/feature'
     # Likewise for the alternative method (single directory, multiple branches)
     production:
       - salt-formula
diff --git a/salt/formulas.jinja b/salt/formulas.jinja
index a501c04..f596ca6 100644
--- a/salt/formulas.jinja
+++ b/salt/formulas.jinja
@@ -25,7 +25,8 @@
 
 {%- macro formulas_roots(env) -%}
 {%- set value = [] -%}
-{%- for dir in formulas.get(env, []) -%}
+{%- for formula in formulas.get(env, []) -%}
+{%- set dir = formula | first if formula is mapping else formula %}
 {%- set basedir = formulas_git_opt(env, 'basedir')|load_yaml -%}
 {%- do value.append('{0}/{1}'.format(basedir, dir)) -%}
 {%- endfor -%}
diff --git a/salt/formulas.sls b/salt/formulas.sls
index 27b49b2..cfed9f3 100644
--- a/salt/formulas.sls
+++ b/salt/formulas.sls
@@ -13,9 +13,11 @@
 # Loop over all formulas listed in pillar data
 {%- for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %}
 {%-   for entry in entries %}
+{%-     set f_name = entry | first if entry is mapping else entry %}
+{%-     set f_opts = entry[f_name] if entry is mapping else {}    %}
 
 {%-     set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
-{%-     set gitdir = '{0}/{1}'.format(basedir, entry) %}
+{%-     set gitdir = '{0}/{1}'.format(basedir, f_name) %}
 {%-     set update = formulas_git_opt(env, 'update')|load_yaml %}
 
 {%-     if formulas_settings.checkout_orig_branch %}
@@ -45,11 +47,12 @@
 {%-     if gitdir_env not in processed_gitdir_envs %}
 {%-       do processed_gitdir_envs.append(gitdir_env) %}
 {%-       set options = formulas_opts_for_git_latest(env)|load_yaml %}
+{%-       do options.update(f_opts) %}
 {%-       set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
 
 {{ gitdir_env }}:
   git.latest:
-    - name: {{ baseurl }}/{{ entry }}.git
+    - name: {{ baseurl }}/{{ f_name }}.git
     - target: {{ gitdir }}
     {%-   for key, value in options.items() %}
     - {{ key }}: {{ value }}

From 78048d88b2e358a7dda57d21a2d32f071e8df733 Mon Sep 17 00:00:00 2001
From: Martin Griesbach <mgriesbach@gmail.com>
Date: Wed, 11 Dec 2019 19:03:35 +0100
Subject: [PATCH 36/42] Vagrant Updates:

	* add Vagrant temp files to .gitignore
	* Update Vagrant Basebox to bento/ubuntu-18.04 (bento images deliver better Vagrant integration)
	* Update Vagrant setup-salt.sh to use the current salt bootstrap script.
---
 .gitignore        | 4 ++++
 Vagrantfile       | 2 +-
 dev/setup-salt.sh | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bbb03c..e71a695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,7 @@ docs/*.md
 Dockerfile.*_*
 ignore/
 tmp/
+
+#Vagrant Specific files
+.vagrant
+top.sls
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
index cd22054..e2a2fa6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,7 +7,7 @@
 VAGRANTFILE_API_VERSION = '2'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'ubuntu/trusty64'
+  config.vm.box = 'bento/ubuntu-18.04'
   config.vm.hostname = 'salt'
   config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root'
 
diff --git a/dev/setup-salt.sh b/dev/setup-salt.sh
index 6a30b6d..82e3025 100644
--- a/dev/setup-salt.sh
+++ b/dev/setup-salt.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-# use the latest stable Salt from repo.saltstack.com
-wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-echo 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main' | sudo tee /etc/apt/sources.list.d/saltstack.list
+curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+sudo sh bootstrap-salt.sh stable
 
 sudo apt-get update -y
 sudo apt-get install salt-master -y
@@ -13,6 +12,6 @@ sudo ln -s /srv/salt/pillar.example /srv/pillar/salt.sls
 sudo ln -s /srv/salt/dev/pillar_top.sls /srv/pillar/top.sls
 # this file will be copied to make a running config. it should not be checked in.
 sudo cp /srv/salt/dev/state_top.sls /srv/salt/top.sls
-# Accept all keys#
 sleep 15 #give the minion a few seconds to register
+# Accept all keys#
 sudo salt-key -y -A

From fdc60aed86c4b5d016aff0745584d89f614208fc Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 16 Dec 2019 13:45:04 +0000
Subject: [PATCH 37/42] ci(gemfile): restrict `train` gem version until
 upstream fix [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/110
---
 Gemfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 5a232b6..8da7a69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,3 +5,7 @@ source 'https://rubygems.org'
 gem 'kitchen-docker', '>= 2.9'
 gem 'kitchen-inspec', '>= 1.1'
 gem 'kitchen-salt', '>= 0.6.0'
+# Latest versions of `train` cause failure when running `kitchen verify`
+# Downgrading to `3.2.0` until this is fixed upstream
+# https://github.com/inspec/train/pull/544#issuecomment-566055052
+gem 'train', '3.2.0'

From 8eab9350438d7b425182a9682a36b3e136467bfd Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Mon, 16 Dec 2019 14:43:05 +0000
Subject: [PATCH 39/42] chore(release): 1.0.0 [skip ci]

# [1.0.0](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.9...v1.0.0) (2019-12-16)

### Continuous Integration

* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([fdc60ae](https://github.com/saltstack-formulas/salt-formula/commit/fdc60aed86c4b5d016aff0745584d89f614208fc))

### Features

* **per-formula-opts:** configure git.latest state per formula ([82c840d](https://github.com/saltstack-formulas/salt-formula/commit/82c840d6f96f69223c0df4b8463a072613a9d2df))
* **per-formula-opts:** configure git.latest state per formula ([9362277](https://github.com/saltstack-formulas/salt-formula/commit/9362277f2a61762b818dc775b30f15f93733efd5))

### BREAKING CHANGES

* **per-formula-opts:** Potential adverse affect on running `salt.formulas` with multiple envs
---
 AUTHORS.md         |  9 +++++----
 CHANGELOG.md       | 18 ++++++++++++++++++
 FORMULA            |  2 +-
 docs/AUTHORS.rst   | 15 +++++++++------
 docs/CHANGELOG.rst | 22 ++++++++++++++++++++++
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 55e7aee..21eca0e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,9 +4,9 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|98
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|99
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|62
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|66
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
@@ -32,11 +32,11 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|4
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/41886?v=4' width='36' height='36' alt='@jbouse'>|[@jbouse](https://github.com/jbouse)|4
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/48949?v=4' width='36' height='36' alt='@tampakrap'>|[@tampakrap](https://github.com/tampakrap)|4
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/31497?v=4' width='36' height='36' alt='@MSeven'>|[@MSeven](https://github.com/MSeven)|4
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|3
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/652532?v=4' width='36' height='36' alt='@jcftang'>|[@jcftang](https://github.com/jcftang)|3
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/830800?v=4' width='36' height='36' alt='@johtso'>|[@johtso](https://github.com/johtso)|3
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/90042?v=4' width='36' height='36' alt='@kev009'>|[@kev009](https://github.com/kev009)|3
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/31497?v=4' width='36' height='36' alt='@MSeven'>|[@MSeven](https://github.com/MSeven)|3
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/299386?v=4' width='36' height='36' alt='@excavador'>|[@excavador](https://github.com/excavador)|3
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>|[@vquiering](https://github.com/vquiering)|3
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2377054?v=4' width='36' height='36' alt='@smlloyd'>|[@smlloyd](https://github.com/smlloyd)|3
@@ -101,9 +101,10 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/94636?v=4' width='36' height='36' alt='@jpic'>|[@jpic](https://github.com/jpic)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/6826176?v=4' width='36' height='36' alt='@kabakaev'>|[@kabakaev](https://github.com/kabakaev)|1
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1610361?v=4' width='36' height='36' alt='@mechleg'>|[@mechleg](https://github.com/mechleg)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>|[@ze42](https://github.com/ze42)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/542613?v=4' width='36' height='36' alt='@bersace'>|[@bersace](https://github.com/bersace)|1
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-03.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-16.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f9fc93..a2ba0d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+# [1.0.0](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.9...v1.0.0) (2019-12-16)
+
+
+### Continuous Integration
+
+* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([fdc60ae](https://github.com/saltstack-formulas/salt-formula/commit/fdc60aed86c4b5d016aff0745584d89f614208fc))
+
+
+### Features
+
+* **per-formula-opts:** configure git.latest state per formula ([82c840d](https://github.com/saltstack-formulas/salt-formula/commit/82c840d6f96f69223c0df4b8463a072613a9d2df))
+* **per-formula-opts:** configure git.latest state per formula ([9362277](https://github.com/saltstack-formulas/salt-formula/commit/9362277f2a61762b818dc775b30f15f93733efd5))
+
+
+### BREAKING CHANGES
+
+* **per-formula-opts:** Potential adverse affect on running `salt.formulas` with multiple envs
+
 ## [0.59.9](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.8...v0.59.9) (2019-12-03)
 
 
diff --git a/FORMULA b/FORMULA
index 160c0ce..bd0b9ae 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 0.59.9
+version: 1.0.0
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 4725786..2963325 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,13 +15,13 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - Contributions
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
      - `@aboe76 <https://github.com/aboe76>`_
-     - 98
+     - 99
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
      - `@gravyboat <https://github.com/gravyboat>`_
      - 71
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 62
+     - 66
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
      - `@nmadhok <https://github.com/nmadhok>`_
      - 54
@@ -97,6 +97,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/48949?v=4' width='36' height='36' alt='@tampakrap'>`
      - `@tampakrap <https://github.com/tampakrap>`_
      - 4
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/31497?v=4' width='36' height='36' alt='@MSeven'>`
+     - `@MSeven <https://github.com/MSeven>`_
+     - 4
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
      - `@dafyddj <https://github.com/dafyddj>`_
      - 3
@@ -109,9 +112,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/90042?v=4' width='36' height='36' alt='@kev009'>`
      - `@kev009 <https://github.com/kev009>`_
      - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/31497?v=4' width='36' height='36' alt='@MSeven'>`
-     - `@MSeven <https://github.com/MSeven>`_
-     - 3
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/299386?v=4' width='36' height='36' alt='@excavador'>`
      - `@excavador <https://github.com/excavador>`_
      - 3
@@ -304,6 +304,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1610361?v=4' width='36' height='36' alt='@mechleg'>`
      - `@mechleg <https://github.com/mechleg>`_
      - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>`
+     - `@sticky-note <https://github.com/sticky-note>`_
+     - 1
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>`
      - `@ze42 <https://github.com/ze42>`_
      - 1
@@ -314,4 +317,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-12-03.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-12-16.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index b48b96f..ab79308 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,28 @@
 Changelog
 =========
 
+`1.0.0 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.9...v1.0.0>`_ (2019-12-16)
+-------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **gemfile:** restrict ``train`` gem version until upstream fix [skip ci] (\ `fdc60ae <https://github.com/saltstack-formulas/salt-formula/commit/fdc60aed86c4b5d016aff0745584d89f614208fc>`_\ )
+
+Features
+^^^^^^^^
+
+
+* **per-formula-opts:** configure git.latest state per formula (\ `82c840d <https://github.com/saltstack-formulas/salt-formula/commit/82c840d6f96f69223c0df4b8463a072613a9d2df>`_\ )
+* **per-formula-opts:** configure git.latest state per formula (\ `9362277 <https://github.com/saltstack-formulas/salt-formula/commit/9362277f2a61762b818dc775b30f15f93733efd5>`_\ )
+
+BREAKING CHANGES
+^^^^^^^^^^^^^^^^
+
+
+* **per-formula-opts:** Potential adverse affect on running ``salt.formulas`` with multiple envs
+
 `0.59.9 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.8...v0.59.9>`_ (2019-12-03)
 ---------------------------------------------------------------------------------------------------------
 

From eda88bd1a684c8d462e12db31fb29cbccdf67a3d Mon Sep 17 00:00:00 2001
From: nb <none@nowhere.nw>
Date: Thu, 13 Jun 2019 16:20:16 +1100
Subject: [PATCH 40/42] feat(formulas): git.latest parallelization

---
 salt/formulas.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/formulas.sls b/salt/formulas.sls
index cfed9f3..9427a3a 100644
--- a/salt/formulas.sls
+++ b/salt/formulas.sls
@@ -34,6 +34,7 @@
 {%-       do processed_basedirs.append(basedir) %}
 {{ basedir }}:
   file.directory:
+    - parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }}
     {%-   for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
                                                {'makedirs': True}).items() %}
     - {{ key }}: {{ value }}
@@ -53,12 +54,11 @@
 {{ gitdir_env }}:
   git.latest:
     - name: {{ baseurl }}/{{ f_name }}.git
+    - parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }}
     - target: {{ gitdir }}
     {%-   for key, value in options.items() %}
     - {{ key }}: {{ value }}
     {%-   endfor %}
-    - require:
-      - file: {{ basedir }}
     {%-   if not update %}
     - unless: test -e {{ gitdir }} >/dev/null 2>&1
     {%-   endif %}

From 72e2f3640fb74fb735993ec0e5cdf4fd3dc72e9a Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 19 Dec 2019 19:07:24 +0000
Subject: [PATCH 41/42] chore(release): 1.1.0 [skip ci]

# [1.1.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.0.0...v1.1.0) (2019-12-19)

### Features

* **formulas:** git.latest parallelization ([eda88bd](https://github.com/saltstack-formulas/salt-formula/commit/eda88bd1a684c8d462e12db31fb29cbccdf67a3d))
---
 AUTHORS.md         | 4 ++--
 CHANGELOG.md       | 7 +++++++
 FORMULA            | 2 +-
 docs/AUTHORS.rst   | 4 ++--
 docs/CHANGELOG.rst | 9 +++++++++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 21eca0e..fbef2f1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord
 
 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|99
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|100
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|66
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
@@ -107,4 +107,4 @@ Avatar|Contributor|Contributions
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-16.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-19.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2ba0d1..68bb4c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+# [1.1.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.0.0...v1.1.0) (2019-12-19)
+
+
+### Features
+
+* **formulas:** git.latest parallelization ([eda88bd](https://github.com/saltstack-formulas/salt-formula/commit/eda88bd1a684c8d462e12db31fb29cbccdf67a3d))
+
 # [1.0.0](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.9...v1.0.0) (2019-12-16)
 
 
diff --git a/FORMULA b/FORMULA
index bd0b9ae..03e9aef 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: salt
 os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 1.0.0
+version: 1.1.0
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 2963325..b313b0e 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - Contributions
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
      - `@aboe76 <https://github.com/aboe76>`_
-     - 99
+     - 100
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
      - `@gravyboat <https://github.com/gravyboat>`_
      - 71
@@ -317,4 +317,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-12-16.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-12-19.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index ab79308..61afcd5 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog
 =========
 
+`1.1.0 <https://github.com/saltstack-formulas/salt-formula/compare/v1.0.0...v1.1.0>`_ (2019-12-19)
+------------------------------------------------------------------------------------------------------
+
+Features
+^^^^^^^^
+
+
+* **formulas:** git.latest parallelization (\ `eda88bd <https://github.com/saltstack-formulas/salt-formula/commit/eda88bd1a684c8d462e12db31fb29cbccdf67a3d>`_\ )
+
 `1.0.0 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.9...v1.0.0>`_ (2019-12-16)
 -------------------------------------------------------------------------------------------------------
 

From 9d30df2f5f7405b9e354203f22a524b79a44ac15 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 22 Dec 2019 01:02:06 +0000
Subject: [PATCH 42/42] ci(travis): use `major.minor` for `semantic-release`
 version [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/112
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 52cac27..37d9a3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,4 +107,4 @@ jobs:
         # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default
         edge: true
         # Run `semantic-release`
-        script: 'npx semantic-release@15'
+        script: 'npx semantic-release@15.14'