diff --git a/AUTHORS.md b/AUTHORS.md index 69164de..0c23737 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -33,11 +33,11 @@ Avatar|Contributor|Contributions @mgomersbach|[@mgomersbach](https://github.com/mgomersbach)|3 @stp-ip|[@stp-ip](https://github.com/stp-ip)|3 @retrry|[@retrry](https://github.com/retrry)|3 -@hackel|[@hackel](https://github.com/hackel)|3 @genuss|[@genuss](https://github.com/genuss)|3 @imran1008|[@imran1008](https://github.com/imran1008)|2 @Mario-F|[@Mario-F](https://github.com/Mario-F)|2 @roock|[@roock](https://github.com/roock)|2 +@hackel|[@hackel](https://github.com/hackel)|2 @teohhanhui|[@teohhanhui](https://github.com/teohhanhui)|2 @thatch45|[@thatch45](https://github.com/thatch45)|2 @vquiering|[@vquiering](https://github.com/vquiering)|2 @@ -64,4 +64,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-08-17. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-26. diff --git a/CHANGELOG.md b/CHANGELOG.md index ec0dde8..462d3a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +# [0.41.0](https://github.com/saltstack-formulas/php-formula/compare/v0.40.1...v0.41.0) (2019-08-26) + + +### Features + +* **ng:** promote NG formula ([f1b71d0](https://github.com/saltstack-formulas/php-formula/commit/f1b71d0)) + ## [0.40.1](https://github.com/saltstack-formulas/php-formula/compare/v0.40.0...v0.40.1) (2019-08-17) diff --git a/FORMULA b/FORMULA index 7493ee5..6b21b17 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.1 +version: 0.41.0 release: 1 minimum_version: 2017.7 summary: Php formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4db7366..f88b719 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -100,9 +100,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@retrry` - `@retrry `_ - 3 - * - :raw-html-m2r:`@hackel` - - `@hackel `_ - - 3 * - :raw-html-m2r:`@genuss` - `@genuss `_ - 3 @@ -115,6 +112,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@roock` - `@roock `_ - 2 + * - :raw-html-m2r:`@hackel` + - `@hackel `_ + - 2 * - :raw-html-m2r:`@teohhanhui` - `@teohhanhui `_ - 2 @@ -188,4 +188,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-08-17. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-26. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 3074752..b39b126 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.41.0 `_ (2019-08-26) +-------------------------------------------------------------------------------------------------------- + +Features +^^^^^^^^ + + +* **ng:** promote NG formula (\ `f1b71d0 `_\ ) + `0.40.1 `_ (2019-08-17) -------------------------------------------------------------------------------------------------------- diff --git a/docs/README.rst b/docs/README.rst index 1d8891c..51981c1 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -33,7 +33,7 @@ Formula to set up and configure php release tag before `v1.0.0 `_, i.e. - `v0.40.1 `_. + `v0.41.0 `_. To migrate from ``php.ng``, simply modify your pillar to promote the entire section under ``php:ng`` so that it is under ``php`` instead. @@ -41,7 +41,7 @@ Formula to set up and configure php unindent one level. Finish by removing the ``ng:`` line. To migrate from the old ``php``, first convert to ``php.ng`` under - `v0.40.1 `_. + `v0.41.0 `_. and then follow the steps laid out in the paragraph directly above. .. contents:: **Table of Contents**