diff --git a/AUTHORS.md b/AUTHORS.md index ba4164f..c4bf346 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,8 +5,8 @@ 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 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 -@myii|[@myii](https://github.com/myii)|70 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @iggy|[@iggy](https://github.com/iggy)|22 @puneetk|[@puneetk](https://github.com/puneetk)|21 @@ -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-01-25. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-02-13. diff --git a/CHANGELOG.md b/CHANGELOG.md index 625b417..d8e8501 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.1.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.2...v1.1.3) (2020-02-13) + + +### Bug Fixes + +* **tpl_path:** replace slspath to tplroot ([bbcc4cd](https://github.com/saltstack-formulas/salt-formula/commit/bbcc4cda7ada4470db07dc02a5938a5b650e2f1c)) + + +### Continuous Integration + +* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([d2d5186](https://github.com/saltstack-formulas/salt-formula/commit/d2d51864a5e4e5584afa979378ded15b1c5b9366)) + ## [1.1.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.1...v1.1.2) (2020-01-25) diff --git a/FORMULA b/FORMULA index 7b4cd75..29549a9 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.2 +version: 1.1.3 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4a4fd0a..37312b8 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -16,12 +16,12 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 100 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 72 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 71 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 70 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 54 @@ -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-01-25. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-02-13. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 74613e6..9bea250 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`1.1.3 `_ (2020-02-13) +------------------------------------------------------------------------------------------------------ + +Bug Fixes +^^^^^^^^^ + + +* **tpl_path:** replace slspath to tplroot (\ `bbcc4cd `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen:** avoid using bootstrap for ``master`` instances [skip ci] (\ `d2d5186 `_\ ) + `1.1.2 `_ (2020-01-25) ------------------------------------------------------------------------------------------------------