diff --git a/AUTHORS.md b/AUTHORS.md index 947dfc88..f93ccd73 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -6,7 +6,7 @@ Avatar|Contributor|Contributions :-:|---|:-: @gravyboat|[@gravyboat](https://github.com/gravyboat)|52 @aboe76|[@aboe76](https://github.com/aboe76)|48 -@myii|[@myii](https://github.com/myii)|36 +@myii|[@myii](https://github.com/myii)|44 @alxwr|[@alxwr](https://github.com/alxwr)|31 @n-rodriguez|[@n-rodriguez](https://github.com/n-rodriguez)|16 @nmadhok|[@nmadhok](https://github.com/nmadhok)|14 @@ -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-10-07. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10. diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ee3da5b..133ec160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.2.2](https://github.com/saltstack-formulas/php-formula/compare/v1.2.1...v1.2.2) (2019-10-10) + + +### Bug Fixes + +* **composer.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/php-formula/commit/4e48a7a)) +* **map.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/php-formula/commit/01f5ede)) +* **repo.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/php-formula/commit/b4d994c)) + + +### Continuous Integration + +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/php-formula/commit/a5a8a95)) + ## [1.2.1](https://github.com/saltstack-formulas/php-formula/compare/v1.2.0...v1.2.1) (2019-10-07) diff --git a/FORMULA b/FORMULA index 77cefd15..d68972d1 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: 1.2.1 +version: 1.2.2 release: 1 minimum_version: 2017.7 summary: Php formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 2af412de..2e45874e 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -21,7 +21,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 48 * - :raw-html-m2r:`@myii` - `@myii `_ - - 36 + - 44 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 31 @@ -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-10-07. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-10. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index d7eea1a4..7c5b8c77 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,23 @@ Changelog ========= +`1.2.2 `_ (2019-10-10) +----------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **composer.sls:** fix ``salt-lint`` errors (\ ` `_\ ) +* **map.jinja:** fix ``salt-lint`` errors (\ ` `_\ ) +* **repo.sls:** fix ``salt-lint`` errors (\ ` `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) + `1.2.1 `_ (2019-10-07) -----------------------------------------------------------------------------------------------------