From 6274a3aa8b9288911d0aa3965f2bcb9e620acd2e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 18 Apr 2020 13:43:42 +0100 Subject: [PATCH 1/3] chore(rubocop): use org-wide standard settings for `Metrics/BlockLength` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/158 --- .rubocop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 96fd6e5..7fd75ac 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,5 +6,11 @@ Layout/LineLength: # Increase from default of `80` # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) Max: 88 +Metrics/BlockLength: + ExcludedMethods: + - control + - describe + # Increase from default of `25` + Max: 30 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` From 7bfe4b46df44082580bcc3cb676e9a33f6d99f4d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 19 Apr 2020 17:51:05 +0100 Subject: [PATCH 2/3] fix(libsaltcli): update `salt-ssh` detection for `enable_ssh_minions` * Automated using https://github.com/myii/ssf-formula/pull/161 --- libvirt/libsaltcli.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt/libsaltcli.jinja b/libvirt/libsaltcli.jinja index 5374ae2..5c3593e 100644 --- a/libvirt/libsaltcli.jinja +++ b/libvirt/libsaltcli.jinja @@ -9,7 +9,7 @@ {%- if opts_cli == 'salt-minion' %} {%- set cli = 'minion' %} {%- elif opts_cli == 'salt-call' %} -{%- set cli = 'ssh' if opts_masteropts_cli == 'salt-ssh' else 'local' %} +{%- set cli = 'ssh' if opts_masteropts_cli in ('salt-ssh', 'salt-master') else 'local' %} {%- else %} {%- set cli = 'unknown' %} {%- endif %} From 6e3a87aff04a15b5d5ca0f2802fd1b93e7b07cbe Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 19 Apr 2020 17:03:15 +0000 Subject: [PATCH 3/3] chore(release): 3.7.4 [skip ci] ## [3.7.4](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.7.3...v3.7.4) (2020-04-19) ### Bug Fixes * **libsaltcli:** update `salt-ssh` detection for `enable_ssh_minions` ([7bfe4b4](https://github.com/saltstack-formulas/libvirt-formula/commit/7bfe4b46df44082580bcc3cb676e9a33f6d99f4d)) --- 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 32975fc..8a7f54c 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 :-:|---|:-: -@myii|[@myii](https://github.com/myii)|52 +@myii|[@myii](https://github.com/myii)|54 @baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|30 @aboe76|[@aboe76](https://github.com/aboe76)|18 @gravyboat|[@gravyboat](https://github.com/gravyboat)|6 @@ -28,4 +28,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-03-27. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-04-19. diff --git a/CHANGELOG.md b/CHANGELOG.md index e315761..2abef3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.7.4](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.7.3...v3.7.4) (2020-04-19) + + +### Bug Fixes + +* **libsaltcli:** update `salt-ssh` detection for `enable_ssh_minions` ([7bfe4b4](https://github.com/saltstack-formulas/libvirt-formula/commit/7bfe4b46df44082580bcc3cb676e9a33f6d99f4d)) + ## [3.7.3](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.7.2...v3.7.3) (2020-03-27) diff --git a/FORMULA b/FORMULA index 5eb62eb..c7980bf 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: libvirt os: Debian, CentOS, openSUSE, Suse os_family: Debian, RedHat, Suse -version: 3.7.3 +version: 3.7.4 release: 1 minimum_version: 2018.3 summary: libvirt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 8568687..afdfdfe 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:`@myii` - `@myii `_ - - 52 + - 54 * - :raw-html-m2r:`@baby-gnu` - `@baby-gnu `_ - 30 @@ -80,4 +80,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-03-27. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-04-19. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 1059f71..779713f 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`3.7.4 `_ (2020-04-19) +--------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **libsaltcli:** update ``salt-ssh`` detection for ``enable_ssh_minions`` (\ `7bfe4b4 `_\ ) + `3.7.3 `_ (2020-03-27) ---------------------------------------------------------------------------------------------------------