diff --git a/AUTHORS.md b/AUTHORS.md index 506d1e8..42cb9e5 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -63,4 +63,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-07. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-12. diff --git a/CHANGELOG.md b/CHANGELOG.md index a5c32dd..689558a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.39.1](https://github.com/saltstack-formulas/php-formula/compare/v0.39.0...v0.39.1) (2019-08-12) + + +### Bug Fixes + +* **installed.jinja:** remove `include` to prevent conflicting IDs ([cb11784](https://github.com/saltstack-formulas/php-formula/commit/cb11784)), closes [#188](https://github.com/saltstack-formulas/php-formula/issues/188) + # [0.39.0](https://github.com/saltstack-formulas/php-formula/compare/v0.38.1...v0.39.0) (2019-08-07) diff --git a/FORMULA b/FORMULA index 44a1041..b460755 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.39.0 +version: 0.39.1 release: 1 minimum_version: 2017.7 summary: Php formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 3655626..64e81a3 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -185,4 +185,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-07. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-12. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index ccad5dd..3798455 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.39.1 `_ (2019-08-12) +-------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **installed.jinja:** remove ``include`` to prevent conflicting IDs (\ `cb11784 `_\ ), closes `#188 `_ + `0.39.0 `_ (2019-08-07) -------------------------------------------------------------------------------------------------------- diff --git a/docs/README.rst b/docs/README.rst index b57c707..244b824 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.39.0 `_. + `v0.39.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 b8c87f9..1d8eff9 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.39.0`. # + # the final release tag before `v1.0.0`, which is expected to be `v0.39.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 cdff658..818ab8e 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.39.0`. # + # the final release tag before `v1.0.0`, which is expected to be `v0.39.1`. # # # # If you are currently using `php.ng`, there is nothing to do until `v1.0.0` # # is released. #