diff --git a/AUTHORS.md b/AUTHORS.md index 49faf47..c36ecfe 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)|42 +@myii|[@myii](https://github.com/myii)|43 @alxwr|[@alxwr](https://github.com/alxwr)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @@ -17,16 +17,17 @@ Avatar|Contributor|Contributions @landergate|[@landergate](https://github.com/landergate)|9 @bradthurber|[@bradthurber](https://github.com/bradthurber)|8 @babilen5|[@babilen5](https://github.com/babilen5)|8 +@ixs|[@ixs](https://github.com/ixs)|7 @arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|7 @stp-ip|[@stp-ip](https://github.com/stp-ip)|7 @porunov|[@porunov](https://github.com/porunov)|7 -@ixs|[@ixs](https://github.com/ixs)|6 @genuss|[@genuss](https://github.com/genuss)|6 @kadogo|[@kadogo](https://github.com/kadogo)|6 @bmwiedemann|[@bmwiedemann](https://github.com/bmwiedemann)|5 @eliasp|[@eliasp](https://github.com/eliasp)|5 @multani|[@multani](https://github.com/multani)|5 @rhertzog|[@rhertzog](https://github.com/rhertzog)|4 +@scambra|[@scambra](https://github.com/scambra)|4 @daschatten|[@daschatten](https://github.com/daschatten)|4 @adherzog|[@adherzog](https://github.com/adherzog)|3 @abrefort|[@abrefort](https://github.com/abrefort)|3 @@ -34,7 +35,6 @@ Avatar|Contributor|Contributions @opdude|[@opdude](https://github.com/opdude)|3 @louis-haddrell|[@louis-haddrell](https://github.com/louis-haddrell)|3 @Wenzel|[@Wenzel](https://github.com/Wenzel)|3 -@scambra|[@scambra](https://github.com/scambra)|3 @abednarik|[@abednarik](https://github.com/abednarik)|3 @dexbleeker|[@dexbleeker](https://github.com/dexbleeker)|3 @vincentfretin|[@vincentfretin](https://github.com/vincentfretin)|3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4893e72..dc2ccf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.39.4](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.3...v0.39.4) (2020-04-02) + + +### Bug Fixes + +* **mod_ssl:** update mod_ssl package variable to prevent clashes ([5591be2](https://github.com/saltstack-formulas/apache-formula/commit/5591be26fddd234ebaed0e024969c45b6536ba82)) + ## [0.39.3](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.2...v0.39.3) (2020-04-02) diff --git a/FORMULA b/FORMULA index f3ca56a..c3b38d0 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: 0.39.3 +version: 0.39.4 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index c0897c1..0d61e85 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 `_ - - 42 + - 43 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 @@ -52,6 +52,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@babilen5` - `@babilen5 `_ - 8 + * - :raw-html-m2r:`@ixs` + - `@ixs `_ + - 7 * - :raw-html-m2r:`@arthurlogilab` - `@arthurlogilab `_ - 7 @@ -61,9 +64,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@porunov` - `@porunov `_ - 7 - * - :raw-html-m2r:`@ixs` - - `@ixs `_ - - 6 * - :raw-html-m2r:`@genuss` - `@genuss `_ - 6 @@ -82,6 +82,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@rhertzog` - `@rhertzog `_ - 4 + * - :raw-html-m2r:`@scambra` + - `@scambra `_ + - 4 * - :raw-html-m2r:`@daschatten` - `@daschatten `_ - 4 @@ -103,9 +106,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@Wenzel` - `@Wenzel `_ - 3 - * - :raw-html-m2r:`@scambra` - - `@scambra `_ - - 3 * - :raw-html-m2r:`@abednarik` - `@abednarik `_ - 3 diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 10fc29c..f56c7bd 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.39.4 `_ (2020-04-02) +----------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **mod_ssl:** update mod_ssl package variable to prevent clashes (\ `5591be2 `_\ ) + `0.39.3 `_ (2020-04-02) -----------------------------------------------------------------------------------------------------------