diff --git a/AUTHORS.md b/AUTHORS.md index 43b9ec8..963a87a 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)|153 +@myii|[@myii](https://github.com/myii)|158 @aboe76|[@aboe76](https://github.com/aboe76)|100 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @@ -15,9 +15,9 @@ Avatar|Contributor|Contributions @xenophonf|[@xenophonf](https://github.com/xenophonf)|18 @andrew-vant|[@andrew-vant](https://github.com/andrew-vant)|13 @whiteinge|[@whiteinge](https://github.com/whiteinge)|12 +@dafyddj|[@dafyddj](https://github.com/dafyddj)|11 @rhertzog|[@rhertzog](https://github.com/rhertzog)|11 @pcdummy|[@pcdummy](https://github.com/pcdummy)|11 -@dafyddj|[@dafyddj](https://github.com/dafyddj)|9 @babilen5|[@babilen5](https://github.com/babilen5)|8 @UtahDave|[@UtahDave](https://github.com/UtahDave)|8 @colin-stubbs|[@colin-stubbs](https://github.com/colin-stubbs)|7 @@ -69,6 +69,7 @@ Avatar|Contributor|Contributions @Angelo-Verona|[@Angelo-Verona](https://github.com/Angelo-Verona)|1 @arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|1 @kakwa|[@kakwa](https://github.com/kakwa)|1 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 @danielfrg|[@danielfrg](https://github.com/danielfrg)|1 @vutny|[@vutny](https://github.com/vutny)|1 @blast-hardcheese|[@blast-hardcheese](https://github.com/blast-hardcheese)|1 @@ -111,4 +112,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-01-29. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-02. diff --git a/CHANGELOG.md b/CHANGELOG.md index 224a933..d27ea1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.7.5](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.4...v1.7.5) (2021-03-02) + + +### Bug Fixes + +* revert to using `is mapping` in Jinja2 ([a89fb3f](https://github.com/saltstack-formulas/salt-formula/commit/a89fb3f4aa819ae4767a7818018d292e2b6633df)) + + +### Continuous Integration + +* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([25fea89](https://github.com/saltstack-formulas/salt-formula/commit/25fea89238d0fc453af9679cb364bcdcc2c7f1e0)) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([fb9901e](https://github.com/saltstack-formulas/salt-formula/commit/fb9901e3acd334fc91f21abab4089a53977f6061)) +* **pre-commit:** update hook for `rubocop` [skip ci] ([a874a76](https://github.com/saltstack-formulas/salt-formula/commit/a874a76967b30426ec8ff9ccae8cb3801682cbcb)) + ## [1.7.4](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.3...v1.7.4) (2021-01-29) diff --git a/FORMULA b/FORMULA index 7addf1d..fa6fcbd 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.7.4 +version: 1.7.5 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 3d0c16b..da6cd4b 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 `_ - - 153 + - 158 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 100 @@ -46,15 +46,15 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 12 + * - :raw-html-m2r:`@dafyddj` + - `@dafyddj `_ + - 11 * - :raw-html-m2r:`@rhertzog` - `@rhertzog `_ - 11 * - :raw-html-m2r:`@pcdummy` - `@pcdummy `_ - 11 - * - :raw-html-m2r:`@dafyddj` - - `@dafyddj `_ - - 9 * - :raw-html-m2r:`@babilen5` - `@babilen5 `_ - 8 @@ -208,6 +208,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@kakwa` - `@kakwa `_ - 1 + * - :raw-html-m2r:`@baby-gnu` + - `@baby-gnu `_ + - 1 * - :raw-html-m2r:`@danielfrg` - `@danielfrg `_ - 1 @@ -329,4 +332,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 2021-01-29. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-03-02. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 8a38a5d..90fdb2b 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,23 @@ Changelog ========= +`1.7.5 `_ (2021-03-02) +------------------------------------------------------------------------------------------------------ + +Bug Fixes +^^^^^^^^^ + + +* revert to using ``is mapping`` in Jinja2 (\ `a89fb3f `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `25fea89 `_\ ) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `fb9901e `_\ ) +* **pre-commit:** update hook for ``rubocop`` [skip ci] (\ `a874a76 `_\ ) + `1.7.4 `_ (2021-01-29) ------------------------------------------------------------------------------------------------------