diff --git a/AUTHORS.md b/AUTHORS.md index ab3d1483..77bf3ef5 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -6,7 +6,7 @@ Avatar|Contributor|Contributions :-:|---|:-: @aboe76|[@aboe76](https://github.com/aboe76)|40 @gravyboat|[@gravyboat](https://github.com/gravyboat)|30 -@myii|[@myii](https://github.com/myii)|22 +@myii|[@myii](https://github.com/myii)|26 @puneetk|[@puneetk](https://github.com/puneetk)|14 @nmadhok|[@nmadhok](https://github.com/nmadhok)|13 @whiteinge|[@whiteinge](https://github.com/whiteinge)|13 @@ -91,4 +91,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-10. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11. diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f6bb29c..099d4656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.48.2](https://github.com/saltstack-formulas/users-formula/compare/v0.48.1...v0.48.2) (2019-10-11) + + +### Bug Fixes + +* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/users-formula/commit/13dd7f9)) + + +### Continuous Integration + +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/users-formula/commit/99136b5)) +* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/users-formula/commit/96999c2)) + ## [0.48.1](https://github.com/saltstack-formulas/users-formula/compare/v0.48.0...v0.48.1) (2019-10-10) diff --git a/FORMULA b/FORMULA index 5c1fa513..c79997e4 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: users os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS -version: 0.48.1 +version: 0.48.2 release: 1 minimum_version: 2017.7 summary: users formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4e828eab..661b8da7 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 - 30 * - :raw-html-m2r:`@myii` - `@myii `_ - - 22 + - 26 * - :raw-html-m2r:`@puneetk` - `@puneetk `_ - 14 @@ -269,4 +269,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-10. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-11. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index e5bdd3e9..df2b6776 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`0.48.2 `_ (2019-10-11) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) +* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` `_\ ) + `0.48.1 `_ (2019-10-10) ----------------------------------------------------------------------------------------------------------