diff --git a/AUTHORS.md b/AUTHORS.md index 67f7c44d0..614f671f8 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)|235 +@myii|[@myii](https://github.com/myii)|238 @aboe76|[@aboe76](https://github.com/aboe76)|100 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @@ -113,4 +113,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-11-17. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-11-22. diff --git a/CHANGELOG.md b/CHANGELOG.md index 33a62d2d8..471c83e92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.9.7](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.6...v1.9.7) (2021-11-22) + + +### Continuous Integration + +* **kitchen+gitlab:** adjust matrix to add `3004` ([93289f6](https://github.com/saltstack-formulas/salt-formula/commit/93289f6df12a675eafcf719ced7363e350b9651b)) + + +### Tests + +* **silicon:** add pillar and verification files for `3004` ([f9ff8ea](https://github.com/saltstack-formulas/salt-formula/commit/f9ff8eab10fe22d6930107cefef4a589b85e81d0)) + ## [1.9.6](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.5...v1.9.6) (2021-11-17) diff --git a/FORMULA b/FORMULA index 796c439c5..769a12aa1 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.9.6 +version: 1.9.7 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index aa07fa4e5..61ed4d93c 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 `_ - - 235 + - 238 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 100 @@ -335,4 +335,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-11-17. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-11-22. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index e5d0596d6..3ebb7f32b 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`1.9.7 `_ (2021-11-22) +------------------------------------------------------------------------------------------------------ + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+gitlab:** adjust matrix to add ``3004`` (\ `93289f6 `_\ ) + +Tests +^^^^^ + + +* **silicon:** add pillar and verification files for ``3004`` (\ `f9ff8ea `_\ ) + `1.9.6 `_ (2021-11-17) ------------------------------------------------------------------------------------------------------