diff --git a/AUTHORS.md b/AUTHORS.md index be6051e..b367624 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)|83 +@myii|[@myii](https://github.com/myii)|89 @alxwr|[@alxwr](https://github.com/alxwr)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @@ -64,7 +64,7 @@ Avatar|Contributor|Contributions @dimitry-unified-streaming|[@dimitry-unified-streaming](https://github.com/dimitry-unified-streaming)|1 @fintanmm|[@fintanmm](https://github.com/fintanmm)|1 @fcrozat|[@fcrozat](https://github.com/fcrozat)|1 -@SynPrime|[@SynPrime](https://github.com/SynPrime)|1 +@genaumann|[@genaumann](https://github.com/genaumann)|1 @jbouse|[@jbouse](https://github.com/jbouse)|1 @jerrykan|[@jerrykan](https://github.com/jerrykan)|1 @jcristau|[@jcristau](https://github.com/jcristau)|1 @@ -95,4 +95,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-04-03. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-04-30. diff --git a/CHANGELOG.md b/CHANGELOG.md index 523f3d2..3172d24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.1.3](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.2...v1.1.3) (2021-04-30) + + +### Bug Fixes + +* **config/vhosts/standard:** remove erroneous trailing colon ([dedb9e2](https://github.com/saltstack-formulas/apache-formula/commit/dedb9e2f400aa9d391ae39c22f8a4fec1e7bc220)), closes [#302](https://github.com/saltstack-formulas/apache-formula/issues/302) + + +### Continuous Integration + +* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([3c21740](https://github.com/saltstack-formulas/apache-formula/commit/3c21740ba52fa5c2b5cf39cddce6a42d13d17988)) +* **vagrant:** add FreeBSD 13.0 [skip ci] ([298fdf4](https://github.com/saltstack-formulas/apache-formula/commit/298fdf4fb569a3d1d4a9dadedb4c3924bcb8cc9a)) +* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([f354ace](https://github.com/saltstack-formulas/apache-formula/commit/f354ace8e7d328580a60dbc09703ddc54a6af0a0)) + ## [1.1.2](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.1...v1.1.2) (2021-04-03) diff --git a/FORMULA b/FORMULA index 81a3de0..de71944 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.2 +version: 1.1.3 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 26bf0a4..6dd580a 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 `_ - - 83 + - 89 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 @@ -193,8 +193,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@fcrozat` - `@fcrozat `_ - 1 - * - :raw-html-m2r:`@SynPrime` - - `@SynPrime `_ + * - :raw-html-m2r:`@genaumann` + - `@genaumann `_ - 1 * - :raw-html-m2r:`@jbouse` - `@jbouse `_ @@ -281,4 +281,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-04-03. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-04-30. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index f863052..7e5712f 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,23 @@ Changelog ========= +`1.1.3 `_ (2021-04-30) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **config/vhosts/standard:** remove erroneous trailing colon (\ `dedb9e2 `_\ ), closes `#302 `_ + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `3c21740 `_\ ) +* **vagrant:** add FreeBSD 13.0 [skip ci] (\ `298fdf4 `_\ ) +* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] (\ `f354ace `_\ ) + `1.1.2 `_ (2021-04-03) --------------------------------------------------------------------------------------------------------