diff --git a/AUTHORS.md b/AUTHORS.md index 0637ae9..f2168d8 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,17 +4,18 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|64 +@myii|[@myii](https://github.com/myii)|75 @aboe76|[@aboe76](https://github.com/aboe76)|24 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|13 @Sxderp|[@Sxderp](https://github.com/Sxderp)|5 +@dafyddj|[@dafyddj](https://github.com/dafyddj)|3 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|3 @hoonetorg|[@hoonetorg](https://github.com/hoonetorg)|3 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|3 @tinuva|[@tinuva](https://github.com/tinuva)|3 @amendlik|[@amendlik](https://github.com/amendlik)|2 @apatard|[@apatard](https://github.com/apatard)|2 -@dafyddj|[@dafyddj](https://github.com/dafyddj)|2 -@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|2 +@genaumann|[@genaumann](https://github.com/genaumann)|2 @Angelo-Verona|[@Angelo-Verona](https://github.com/Angelo-Verona)|1 @cmercier|[@cmercier](https://github.com/cmercier)|1 @basepi|[@basepi](https://github.com/basepi)|1 @@ -25,4 +26,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-02-05. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-26. diff --git a/CHANGELOG.md b/CHANGELOG.md index de28e8e..2173012 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## [1.2.1](https://github.com/saltstack-formulas/firewalld-formula/compare/v1.2.0...v1.2.1) (2021-04-26) + + +### Bug Fixes + +* **zone.xml:** fix jinja error in rule.reject ([194cb99](https://github.com/saltstack-formulas/firewalld-formula/commit/194cb99f1684bfd0a3ecdf89adc2acd1287d83dd)) +* **zone.xml:** fix XML error ([88f9fd4](https://github.com/saltstack-formulas/firewalld-formula/commit/88f9fd4687ebb0845123cadb9974419cf496a1bf)) + + +### Continuous Integration + +* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([a2bcd11](https://github.com/saltstack-formulas/firewalld-formula/commit/a2bcd11c4ca18bb374cc802c3575b791713b7a04)) +* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([98f91c2](https://github.com/saltstack-formulas/firewalld-formula/commit/98f91c29dff006757b18b3567789ed67435d012a)) +* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([79eb50a](https://github.com/saltstack-formulas/firewalld-formula/commit/79eb50a11aeb630f2732e8e1c1a29c054cb8ed4c)) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([0bb7751](https://github.com/saltstack-formulas/firewalld-formula/commit/0bb7751957ed1d70cab6a711f9f0bc7b8ce54e3a)) + + +### Tests + +* **_mapdata:** add verification file for `fedora-34` [skip ci] ([b8e0cb8](https://github.com/saltstack-formulas/firewalld-formula/commit/b8e0cb8b14367dc22a8c776c4f3255bab674e9a7)) +* standardise use of `share` suite & `_mapdata` state [skip ci] ([291adbd](https://github.com/saltstack-formulas/firewalld-formula/commit/291adbd997657f3e34124c887a201c1b99d0a914)) +* **_mapdata:** add verification files for new platforms ([b9d8775](https://github.com/saltstack-formulas/firewalld-formula/commit/b9d8775937bc9e533f0e47b384acefce41b80369)) + # [1.2.0](https://github.com/saltstack-formulas/firewalld-formula/compare/v1.1.2...v1.2.0) (2021-02-05) diff --git a/FORMULA b/FORMULA index 543a4ae..43ec0a3 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: firewalld os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS -version: 1.2.0 +version: 1.2.1 release: 1 minimum_version: 2017.7 summary: firewalld formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 9acefd9..32c62c8 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 `_ - - 64 + - 75 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 24 @@ -25,12 +25,18 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@Sxderp` - `@Sxderp `_ - 5 + * - :raw-html-m2r:`@dafyddj` + - `@dafyddj `_ + - 3 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 3 * - :raw-html-m2r:`@hoonetorg` - `@hoonetorg `_ - 3 + * - :raw-html-m2r:`@baby-gnu` + - `@baby-gnu `_ + - 3 * - :raw-html-m2r:`@tinuva` - `@tinuva `_ - 3 @@ -40,11 +46,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@apatard` - `@apatard `_ - 2 - * - :raw-html-m2r:`@dafyddj` - - `@dafyddj `_ - - 2 - * - :raw-html-m2r:`@baby-gnu` - - `@baby-gnu `_ + * - :raw-html-m2r:`@genaumann` + - `@genaumann `_ - 2 * - :raw-html-m2r:`@Angelo-Verona` - `@Angelo-Verona `_ @@ -71,4 +74,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-02-05. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-04-26. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index ea3c7a4..cc03083 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog ========= +`1.2.1 `_ (2021-04-26) +----------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **zone.xml:** fix jinja error in rule.reject (\ `194cb99 `_\ ) +* **zone.xml:** fix XML error (\ `88f9fd4 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `a2bcd11 `_\ ) +* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `98f91c2 `_\ ) +* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `79eb50a `_\ ) +* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `0bb7751 `_\ ) + +Tests +^^^^^ + + +* **_mapdata:** add verification file for ``fedora-34`` [skip ci] (\ `b8e0cb8 `_\ ) +* standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `291adbd `_\ ) +* **_mapdata:** add verification files for new platforms (\ `b9d8775 `_\ ) + `1.2.0 `_ (2021-02-05) -----------------------------------------------------------------------------------------------------------