chore(release): 1.2.2 [skip ci]

## [1.2.2](v1.2.1...v1.2.2) (2019-10-10) ### Bug Fixes * **composer.sls:** fix `salt-lint` errors ([](4e48a7a)) * **map.jinja:** fix `salt-lint` errors ([](01f5ede)) * **repo.sls:** fix `salt-lint` errors ([](b4d994c)) ### Continuous Integration * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](a5a8a95))
saltstack-formulas · Oct 10, 2019 · d78e96f · d78e96f
1 parent 4461987
commit d78e96f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -6,7 +6,7 @@ Avatar|Contributor|Contributions
 :-:|---|:-:
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|52
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|48
-<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|36
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|44
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|31
 <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|16
 <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@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
@@ -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
@@ -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
@@ -21,7 +21,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 48
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
      - `@myii <https://github.com/myii>`_
-     - 36
+     - 44
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
      - `@alxwr <https://github.com/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 <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/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,6 +2,23 @@
 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)
 -----------------------------------------------------------------------------------------------------