From 10e23bc21960b97e08c77e5e0d59f3d6e97bf283 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 25 Jul 2019 07:55:47 +0000 Subject: [PATCH] chore(release): 3.1.1 [skip ci] ## [3.1.1](https://github.com/saltstack-formulas/template-formula/compare/v3.1.0...v3.1.1) (2019-07-25) ### Bug Fixes * **tofs:** prepend the config-based `source_files` to the default ([3483e76](https://github.com/saltstack-formulas/template-formula/commit/3483e76)), closes [/github.com/saltstack-formulas/nginx-formula/pull/247#issuecomment-514262549](https://github.com//github.com/saltstack-formulas/nginx-formula/pull/247/issues/issuecomment-514262549) [#151](https://github.com/saltstack-formulas/template-formula/issues/151) ### Documentation * **tofs:** ensure merged will all recent changes ([6a614d9](https://github.com/saltstack-formulas/template-formula/commit/6a614d9)) * **tofs:** update from `nginx-formula` ([23a221e](https://github.com/saltstack-formulas/template-formula/commit/23a221e)), closes [/github.com/saltstack-formulas/nginx-formula/pull/238#discussion_r289124365](https://github.com//github.com/saltstack-formulas/nginx-formula/pull/238/issues/discussion_r289124365) --- AUTHORS.md | 5 +++-- CHANGELOG.md | 13 +++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 7 +++++-- docs/CHANGELOG.rst | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 822bd145..27a693d7 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)|169 +@myii|[@myii](https://github.com/myii)|170 @aboe76|[@aboe76](https://github.com/aboe76)|22 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|17 @n-rodriguez|[@n-rodriguez](https://github.com/n-rodriguez)|8 @@ -19,6 +19,7 @@ Avatar|Contributor|Contributions @puneetk|[@puneetk](https://github.com/puneetk)|2 @andygabby|[@andygabby](https://github.com/andygabby)|1 @Jokipii|[@Jokipii](https://github.com/Jokipii)|1 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|1 @johnkeates|[@johnkeates](https://github.com/johnkeates)|1 @duk3luk3|[@duk3luk3](https://github.com/duk3luk3)|1 @marco-m|[@marco-m](https://github.com/marco-m)|1 @@ -29,4 +30,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-07-24. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-25. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da9e872..c45bcffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [3.1.1](https://github.com/saltstack-formulas/template-formula/compare/v3.1.0...v3.1.1) (2019-07-25) + + +### Bug Fixes + +* **tofs:** prepend the config-based `source_files` to the default ([3483e76](https://github.com/saltstack-formulas/template-formula/commit/3483e76)), closes [/github.com/saltstack-formulas/nginx-formula/pull/247#issuecomment-514262549](https://github.com//github.com/saltstack-formulas/nginx-formula/pull/247/issues/issuecomment-514262549) [#151](https://github.com/saltstack-formulas/template-formula/issues/151) + + +### Documentation + +* **tofs:** ensure merged will all recent changes ([6a614d9](https://github.com/saltstack-formulas/template-formula/commit/6a614d9)) +* **tofs:** update from `nginx-formula` ([23a221e](https://github.com/saltstack-formulas/template-formula/commit/23a221e)), closes [/github.com/saltstack-formulas/nginx-formula/pull/238#discussion_r289124365](https://github.com//github.com/saltstack-formulas/nginx-formula/pull/238/issues/discussion_r289124365) + # [3.1.0](https://github.com/saltstack-formulas/template-formula/compare/v3.0.9...v3.1.0) (2019-07-24) diff --git a/FORMULA b/FORMULA index ef275c16..a24dc750 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: template 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: 3.1.0 +version: 3.1.1 release: 1 minimum_version: 2016.11 summary: template formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 9f8bdccf..ce71a050 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 `_ - - 169 + - 170 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 22 @@ -58,6 +58,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@Jokipii` - `@Jokipii `_ - 1 + * - :raw-html-m2r:`@baby-gnu` + - `@baby-gnu `_ + - 1 * - :raw-html-m2r:`@johnkeates` - `@johnkeates `_ - 1 @@ -83,4 +86,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-07-24. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-07-25. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 274d7db9..c509ae55 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`3.1.1 `_ (2019-07-25) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **tofs:** prepend the config-based ``source_files`` to the default (\ `3483e76 `_\ ), closes `/github.com/saltstack-formulas/nginx-formula/pull/247#issuecomment-514262549 `_ `#151 `_ + +Documentation +^^^^^^^^^^^^^ + + +* **tofs:** ensure merged will all recent changes (\ `6a614d9 `_\ ) +* **tofs:** update from ``nginx-formula`` (\ `23a221e `_\ ), closes `/github.com/saltstack-formulas/nginx-formula/pull/238#discussion_r289124365 `_ + `3.1.0 `_ (2019-07-24) ----------------------------------------------------------------------------------------------------------