diff --git a/AUTHORS.md b/AUTHORS.md index 4417558c..69164de0 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -7,7 +7,7 @@ Avatar|Contributor|Contributions @gravyboat|[@gravyboat](https://github.com/gravyboat)|52 @aboe76|[@aboe76](https://github.com/aboe76)|46 @alxwr|[@alxwr](https://github.com/alxwr)|31 -@myii|[@myii](https://github.com/myii)|16 +@myii|[@myii](https://github.com/myii)|17 @nmadhok|[@nmadhok](https://github.com/nmadhok)|14 @cheuschober|[@cheuschober](https://github.com/cheuschober)|12 @babilen5|[@babilen5](https://github.com/babilen5)|11 @@ -56,6 +56,7 @@ Avatar|Contributor|Contributions @mschiff|[@mschiff](https://github.com/mschiff)|1 @mkhubbard|[@mkhubbard](https://github.com/mkhubbard)|1 @taion809|[@taion809](https://github.com/taion809)|1 +@philpep|[@philpep](https://github.com/philpep)|1 @Cottser|[@Cottser](https://github.com/Cottser)|1 @iamseth|[@iamseth](https://github.com/iamseth)|1 @zls|[@zls](https://github.com/zls)|1 diff --git a/CHANGELOG.md b/CHANGELOG.md index b6819fc4..ec0dde8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.40.1](https://github.com/saltstack-formulas/php-formula/compare/v0.40.0...v0.40.1) (2019-08-17) + + +### Bug Fixes + +* **map:** fix missing value for php.lookup.fpm.user in multi-php mode ([f91d942](https://github.com/saltstack-formulas/php-formula/commit/f91d942)) + # [0.40.0](https://github.com/saltstack-formulas/php-formula/compare/v0.39.2...v0.40.0) (2019-08-17) diff --git a/FORMULA b/FORMULA index d0d83e92..7493ee55 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: php os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 0.40.0 +version: 0.40.1 release: 1 minimum_version: 2017.7 summary: Php formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index edbee99f..4db7366e 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 31 * - :raw-html-m2r:`@myii` - `@myii `_ - - 16 + - 17 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 14 @@ -169,6 +169,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@taion809` - `@taion809 `_ - 1 + * - :raw-html-m2r:`@philpep` + - `@philpep `_ + - 1 * - :raw-html-m2r:`@Cottser` - `@Cottser `_ - 1 diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 333cf3d4..30747529 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.40.1 `_ (2019-08-17) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **map:** fix missing value for php.lookup.fpm.user in multi-php mode (\ `f91d942 `_\ ) + `0.40.0 `_ (2019-08-17) -------------------------------------------------------------------------------------------------------- diff --git a/docs/README.rst b/docs/README.rst index be1dce51..17a40af5 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -31,7 +31,7 @@ Formula to set up and configure php the final release tag before `v1.0.0 `_, which is expected to be - `v0.40.0 `_. + `v0.40.1 `_. If you are currently using ``php.ng``, there is nothing to do until `v1.0.0 `_ diff --git a/php/deprecated.sls b/php/deprecated.sls index f3ba31b2..becb5a12 100644 --- a/php/deprecated.sls +++ b/php/deprecated.sls @@ -19,7 +19,7 @@ php-deprecated-in-v1.0.0-test-succeed: # method will be removed and `php.ng` will be promoted to `php` in its place. # # # # If you are not in a position to migrate, you will need to pin your repo to # - # the final release tag before `v1.0.0`, which is expected to be `v0.40.0`. # + # the final release tag before `v1.0.0`, which is expected to be `v0.40.1`. # # # # If you are currently using `php.ng`, there is nothing to do until `v1.0.0` # # is released. # diff --git a/php/ng/deprecated.sls b/php/ng/deprecated.sls index f88646c2..50860638 100644 --- a/php/ng/deprecated.sls +++ b/php/ng/deprecated.sls @@ -19,7 +19,7 @@ php-deprecated-in-v1.0.0-test-succeed: # method will be removed and `php.ng` will be promoted to `php` in its place. # # # # If you are not in a position to migrate, you will need to pin your repo to # - # the final release tag before `v1.0.0`, which is expected to be `v0.40.0`. # + # the final release tag before `v1.0.0`, which is expected to be `v0.40.1`. # # # # If you are currently using `php.ng`, there is nothing to do until `v1.0.0` # # is released. #