diff --git a/AUTHORS.md b/AUTHORS.md index 73d086c..223fe14 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|125 +@myii|[@myii](https://github.com/myii)|128 @aboe76|[@aboe76](https://github.com/aboe76)|100 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @@ -90,6 +90,7 @@ Avatar|Contributor|Contributions @mnaser|[@mnaser](https://github.com/mnaser)|1 @vermut|[@vermut](https://github.com/vermut)|1 @ralucasg|[@ralucasg](https://github.com/ralucasg)|1 +@VBH-Jenkins|[@VBH-Jenkins](https://github.com/VBH-Jenkins)|1 @robruma|[@robruma](https://github.com/robruma)|1 @ryanwalder|[@ryanwalder](https://github.com/ryanwalder)|1 @spoage|[@spoage](https://github.com/spoage)|1 @@ -109,4 +110,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-07-15. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-08-25. diff --git a/CHANGELOG.md b/CHANGELOG.md index 10f8747..3b8bd8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.5.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.5.0...v1.5.1) (2020-08-25) + + +### Bug Fixes + +* **service:** service salt-master and salt-minion to restart last ([d71cf0c](https://github.com/saltstack-formulas/salt-formula/commit/d71cf0c4f9ba716b93b784993f0409337e60fa18)) +* **service:** svc `salt-master` watch `remove-default-master-conf-file` ([e1774e3](https://github.com/saltstack-formulas/salt-formula/commit/e1774e3b40c54b554552ecf34508c1bcbf5ffbd1)) + + +### Styles + +* **libtofs.jinja:** use Black-inspired Jinja formatting [skip ci] ([76e820c](https://github.com/saltstack-formulas/salt-formula/commit/76e820c36f6f0ea712001285dd79cbd5b54489e8)) + # [1.5.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.4.6...v1.5.0) (2020-07-15) diff --git a/FORMULA b/FORMULA index f506aa4..647cae5 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.5.0 +version: 1.5.1 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index eeb5d2a..045a359 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 125 + - 128 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 100 @@ -271,6 +271,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@ralucasg` - `@ralucasg `_ - 1 + * - :raw-html-m2r:`@VBH-Jenkins` + - `@VBH-Jenkins `_ + - 1 * - :raw-html-m2r:`@robruma` - `@robruma `_ - 1 @@ -323,4 +326,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-07-15. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-08-25. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 750023e..ab90100 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`1.5.1 `_ (2020-08-25) +------------------------------------------------------------------------------------------------------ + +Bug Fixes +^^^^^^^^^ + + +* **service:** service salt-master and salt-minion to restart last (\ `d71cf0c `_\ ) +* **service:** svc ``salt-master`` watch ``remove-default-master-conf-file`` (\ `e1774e3 `_\ ) + +Styles +^^^^^^ + + +* **libtofs.jinja:** use Black-inspired Jinja formatting [skip ci] (\ `76e820c `_\ ) + `1.5.0 `_ (2020-07-15) ------------------------------------------------------------------------------------------------------