diff --git a/AUTHORS.md b/AUTHORS.md index c4bf34681..75c32fc09 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,7 +5,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @aboe76|[@aboe76](https://github.com/aboe76)|100 -@myii|[@myii](https://github.com/myii)|72 +@myii|[@myii](https://github.com/myii)|75 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @iggy|[@iggy](https://github.com/iggy)|22 @@ -107,4 +107,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-02-13. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-02-20. diff --git a/CHANGELOG.md b/CHANGELOG.md index d8e8501a8..66f9f462e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +# [1.2.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.3...v1.2.0) (2020-02-20) + + +### Bug Fixes + +* **libtofs:** “files_switch” mess up the variable exported by “map.jinja” [skip ci] ([4955737](https://github.com/saltstack-formulas/salt-formula/commit/4955737f844678ca3ca208340fe73fcd47aab256)) + + +### Continuous Integration + +* **kitchen+travis+inspec:** fix `amazonlinux-2-py3` [skip ci] ([10e2ce0](https://github.com/saltstack-formulas/salt-formula/commit/10e2ce07a4293ad46d785bcbc16b822280f17142)) + + +### Features + +* **metastate:** add metastate per community convention ([fbaa456](https://github.com/saltstack-formulas/salt-formula/commit/fbaa456ca69fafa2a8a4ef910b5e09dafffe5ece)) + ## [1.1.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.2...v1.1.3) (2020-02-13) diff --git a/FORMULA b/FORMULA index 29549a9d7..1a7ae93f9 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.1.3 +version: 1.2.0 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 37312b801..433a5c5c8 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -18,7 +18,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 100 * - :raw-html-m2r:`@myii` - `@myii `_ - - 72 + - 75 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 71 @@ -317,4 +317,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 2020-02-13. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-02-20. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 9bea25001..ecfc8979d 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,27 @@ Changelog ========= +`1.2.0 `_ (2020-02-20) +------------------------------------------------------------------------------------------------------ + +Bug Fixes +^^^^^^^^^ + + +* **libtofs:** “files_switch” mess up the variable exported by “map.jinja” [skip ci] (\ `4955737 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+travis+inspec:** fix ``amazonlinux-2-py3`` [skip ci] (\ `10e2ce0 `_\ ) + +Features +^^^^^^^^ + + +* **metastate:** add metastate per community convention (\ `fbaa456 `_\ ) + `1.1.3 `_ (2020-02-13) ------------------------------------------------------------------------------------------------------