diff --git a/AUTHORS.md b/AUTHORS.md index 7185288..b96443b 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)|102 +@myii|[@myii](https://github.com/myii)|109 @alxwr|[@alxwr](https://github.com/alxwr)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @@ -45,6 +45,7 @@ Avatar|Contributor|Contributions @thornycrackers|[@thornycrackers](https://github.com/thornycrackers)|2 @gaetanars|[@gaetanars](https://github.com/gaetanars)|2 @msciciel|[@msciciel](https://github.com/msciciel)|2 +@mariusvw|[@mariusvw](https://github.com/mariusvw)|2 @actionjack|[@actionjack](https://github.com/actionjack)|2 @mosen|[@mosen](https://github.com/mosen)|2 @RyPeck|[@RyPeck](https://github.com/RyPeck)|2 @@ -71,7 +72,6 @@ Avatar|Contributor|Contributions @kpostrup|[@kpostrup](https://github.com/kpostrup)|1 @morsik|[@morsik](https://github.com/morsik)|1 @madssj|[@madssj](https://github.com/madssj)|1 -@mariusvw|[@mariusvw](https://github.com/mariusvw)|1 @mpeeters|[@mpeeters](https://github.com/mpeeters)|1 @xenophonf|[@xenophonf](https://github.com/xenophonf)|1 @mshade|[@mshade](https://github.com/mshade)|1 @@ -96,4 +96,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-05-14. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-06-28. diff --git a/CHANGELOG.md b/CHANGELOG.md index f564e43..ff3b4f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [1.1.8](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8) (2021-06-28) + + +### Bug Fixes + +* **register_site:** correct semicolon to colon ([4cf848d](https://github.com/saltstack-formulas/apache-formula/commit/4cf848da05eb558012a465bd6996749982908667)) + + +### Continuous Integration + +* **gitlab-ci:** ignore line to avoid `yamllint` violation [skip ci] ([a742f4e](https://github.com/saltstack-formulas/apache-formula/commit/a742f4ee00c08e7db34c2f3adcb8c90a58c851aa)) +* **gitlab-ci:** use `pandoc`-enabled `semantic-release` image [skip ci] ([3bf9c6e](https://github.com/saltstack-formulas/apache-formula/commit/3bf9c6e6a942b86fd16ca4b222bb6a1781f4e09d)) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([10ce382](https://github.com/saltstack-formulas/apache-formula/commit/10ce3822dd7ea9868ee986a08e2ccd48bd0026ee)) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([57e9873](https://github.com/saltstack-formulas/apache-formula/commit/57e98736247b196ad650528b705379fecf58c835)) + ## [1.1.7](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.6...v1.1.7) (2021-05-14) diff --git a/FORMULA b/FORMULA index 8ae29fe..a25a5e4 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: apache os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD os_family: RedHat, Debian, Suse, FreeBSD -version: 1.1.7 +version: 1.1.8 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 85d5706..42b8db0 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 `_ - - 102 + - 109 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 @@ -136,6 +136,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@msciciel` - `@msciciel `_ - 2 + * - :raw-html-m2r:`@mariusvw` + - `@mariusvw `_ + - 2 * - :raw-html-m2r:`@actionjack` - `@actionjack `_ - 2 @@ -214,9 +217,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@madssj` - `@madssj `_ - 1 - * - :raw-html-m2r:`@mariusvw` - - `@mariusvw `_ - - 1 * - :raw-html-m2r:`@mpeeters` - `@mpeeters `_ - 1 @@ -284,4 +284,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-05-14. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-06-28. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 562e6f6..79d1603 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog ========= +`1.1.8 `_ (2021-06-28) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **register_site:** correct semicolon to colon (\ `4cf848d `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gitlab-ci:** ignore line to avoid ``yamllint`` violation [skip ci] (\ `a742f4e `_\ ) +* **gitlab-ci:** use ``pandoc``\ -enabled ``semantic-release`` image [skip ci] (\ `3bf9c6e `_\ ) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `10ce382 `_\ ) +* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `57e9873 `_\ ) + `1.1.7 `_ (2021-05-14) -------------------------------------------------------------------------------------------------------- diff --git a/docs/antora.yml b/docs/antora.yml index 66dd4e5..3b7c8b4 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,7 +1,7 @@ --- name: 'apache-formula' title: 'apache-formula' -version: '1.1.7' +version: '1.1.8' start_page: 'README.adoc' nav: - 'modules/ROOT/nav-repo-docs.adoc' diff --git a/docs/modules/ROOT/pages/AUTHORS.adoc b/docs/modules/ROOT/pages/AUTHORS.adoc index 00fe51d..301c4c6 100644 --- a/docs/modules/ROOT/pages/AUTHORS.adoc +++ b/docs/modules/ROOT/pages/AUTHORS.adoc @@ -12,7 +12,7 @@ _descending_ order. |image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36] |https://github.com/myii[@myii^] -|102 +|109 |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36] |https://github.com/alxwr[@alxwr^] @@ -174,6 +174,10 @@ _descending_ order. |https://github.com/msciciel[@msciciel^] |2 +|image::https://avatars.githubusercontent.com/u/201711?v=4[@mariusvw,36,36] +|https://github.com/mariusvw[@mariusvw^] +|2 + |image::https://avatars.githubusercontent.com/u/485400?v=4[@actionjack,36,36] |https://github.com/actionjack[@actionjack^] |2 @@ -279,10 +283,6 @@ _descending_ order. |https://github.com/madssj[@madssj^] |1 -|image::https://avatars.githubusercontent.com/u/201711?v=4[@mariusvw,36,36] -|https://github.com/mariusvw[@mariusvw^] -|1 - |image::https://avatars.githubusercontent.com/u/1106959?v=4[@mpeeters,36,36] |https://github.com/mpeeters[@mpeeters^] |1 @@ -372,4 +372,4 @@ _descending_ order. Auto-generated by a https://github.com/myii/maintainer[forked version^] of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on -2021-05-14. +2021-06-28. diff --git a/docs/modules/ROOT/pages/CHANGELOG.adoc b/docs/modules/ROOT/pages/CHANGELOG.adoc index 24dbe03..a08053f 100644 --- a/docs/modules/ROOT/pages/CHANGELOG.adoc +++ b/docs/modules/ROOT/pages/CHANGELOG.adoc @@ -2,6 +2,24 @@ :sectnums!: +== link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.7...v1.1.8++[1.1.8^] (2021-06-28) + +=== Bug Fixes + +* *register_site:* correct semicolon to colon +(https://github.com/saltstack-formulas/apache-formula/commit/4cf848da05eb558012a465bd6996749982908667[4cf848d^]) + +=== Continuous Integration + +* *gitlab-ci:* ignore line to avoid `yamllint` violation [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/a742f4ee00c08e7db34c2f3adcb8c90a58c851aa[a742f4e^]) +* *gitlab-ci:* use `pandoc`-enabled `semantic-release` image [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/3bf9c6e6a942b86fd16ca4b222bb6a1781f4e09d[3bf9c6e^]) +* *kitchen+gitlab:* remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/10ce3822dd7ea9868ee986a08e2ccd48bd0026ee[10ce382^]) +* *kitchen+gitlab:* remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] +(https://github.com/saltstack-formulas/apache-formula/commit/57e98736247b196ad650528b705379fecf58c835[57e9873^]) + == link:++https://github.com/saltstack-formulas/apache-formula/compare/v1.1.6...v1.1.7++[1.1.7^] (2021-05-14) === Bug Fixes