diff --git a/AUTHORS.md b/AUTHORS.md index f1e4187..49faf47 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: +@myii|[@myii](https://github.com/myii)|42 @alxwr|[@alxwr](https://github.com/alxwr)|40 -@myii|[@myii](https://github.com/myii)|38 @gravyboat|[@gravyboat](https://github.com/gravyboat)|36 @aboe76|[@aboe76](https://github.com/aboe76)|32 @whiteinge|[@whiteinge](https://github.com/whiteinge)|31 @@ -54,6 +54,7 @@ Avatar|Contributor|Contributions @isntall|[@isntall](https://github.com/isntall)|1 @benjy|[@benjy](https://github.com/benjy)|1 @iggy|[@iggy](https://github.com/iggy)|1 +@chorne-togetherwork|[@chorne-togetherwork](https://github.com/chorne-togetherwork)|1 @corywright|[@corywright](https://github.com/corywright)|1 @ev0rtex|[@ev0rtex](https://github.com/ev0rtex)|1 @dimitry-unified-streaming|[@dimitry-unified-streaming](https://github.com/dimitry-unified-streaming)|1 @@ -87,4 +88,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-20. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-04-02. diff --git a/CHANGELOG.md b/CHANGELOG.md index 8331303..4893e72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.39.3](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.2...v0.39.3) (2020-04-02) + + +### Bug Fixes + +* **debian:** generate remoteip conf before a2enconf ([1ed69f6](https://github.com/saltstack-formulas/apache-formula/commit/1ed69f6c6fab0eb583949105e9e29e58b6ba32a3)) + + +### Continuous Integration + +* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([275b5d5](https://github.com/saltstack-formulas/apache-formula/commit/275b5d5e69fa79f1010852d65f0fcb65cadf735d)) +* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([08cced2](https://github.com/saltstack-formulas/apache-formula/commit/08cced29134ca47824e82ee6afa794233cdb5faa)) + ## [0.39.2](https://github.com/saltstack-formulas/apache-formula/compare/v0.39.1...v0.39.2) (2019-12-20) diff --git a/FORMULA b/FORMULA index c5bee0e..f3ca56a 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.2 +version: 0.39.3 release: 1 minimum_version: 2015.8 summary: Formula for installing Apache diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 2a88d1e..c0897c1 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -13,12 +13,12 @@ This list is sorted by the number of commits per contributor in *descending* ord * - Avatar - Contributor - Contributions + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 42 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 40 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 38 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 36 @@ -163,6 +163,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@iggy` - `@iggy `_ - 1 + * - :raw-html-m2r:`@chorne-togetherwork` + - `@chorne-togetherwork `_ + - 1 * - :raw-html-m2r:`@corywright` - `@corywright `_ - 1 @@ -257,4 +260,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 2019-12-20. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-04-02. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 369265f..10fc29c 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`0.39.3 `_ (2020-04-02) +----------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **debian:** generate remoteip conf before a2enconf (\ `1ed69f6 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen:** avoid using bootstrap for ``master`` instances [skip ci] (\ `275b5d5 `_\ ) +* **travis:** use ``major.minor`` for ``semantic-release`` version [skip ci] (\ `08cced2 `_\ ) + `0.39.2 `_ (2019-12-20) -----------------------------------------------------------------------------------------------------------