Skip to content

Commit 10e23bc

Browse files
chore(release): 3.1.1 [skip ci]
## [3.1.1](v3.1.0...v3.1.1) (2019-07-25) ### Bug Fixes * **tofs:** prepend the config-based `source_files` to the default ([3483e76](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](#151) ### Documentation * **tofs:** ensure merged will all recent changes ([6a614d9](6a614d9)) * **tofs:** update from `nginx-formula` ([23a221e](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)
1 parent 6a614d9 commit 10e23bc

File tree

5 files changed

+38
-5
lines changed

5 files changed

+38
-5
lines changed

AUTHORS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord
44

55
Avatar|Contributor|Contributions
66
:-:|---|:-:
7-
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|169
7+
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|170
88
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|22
99
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|17
1010
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|8
@@ -19,6 +19,7 @@ Avatar|Contributor|Contributions
1919
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|2
2020
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/3536289?v=4' width='36' height='36' alt='@andygabby'>|[@andygabby](https://github.com/andygabby)|1
2121
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1269218?v=4' width='36' height='36' alt='@Jokipii'>|[@Jokipii](https://github.com/Jokipii)|1
22+
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|1
2223
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|1
2324
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/611471?v=4' width='36' height='36' alt='@duk3luk3'>|[@duk3luk3](https://github.com/duk3luk3)|1
2425
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3075069?v=4' width='36' height='36' alt='@marco-m'>|[@marco-m](https://github.com/marco-m)|1
@@ -29,4 +30,4 @@ Avatar|Contributor|Contributions
2930

3031
---
3132

32-
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-24.
33+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-25.

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [3.1.1](https://github.com/saltstack-formulas/template-formula/compare/v3.1.0...v3.1.1) (2019-07-25)
4+
5+
6+
### Bug Fixes
7+
8+
* **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)
9+
10+
11+
### Documentation
12+
13+
* **tofs:** ensure merged will all recent changes ([6a614d9](https://github.com/saltstack-formulas/template-formula/commit/6a614d9))
14+
* **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)
15+
316
# [3.1.0](https://github.com/saltstack-formulas/template-formula/compare/v3.0.9...v3.1.0) (2019-07-24)
417

518

FORMULA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: template
22
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
33
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4-
version: 3.1.0
4+
version: 3.1.1
55
release: 1
66
minimum_version: 2016.11
77
summary: template formula

docs/AUTHORS.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
1515
- Contributions
1616
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
1717
- `@myii <https://github.com/myii>`_
18-
- 169
18+
- 170
1919
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
2020
- `@aboe76 <https://github.com/aboe76>`_
2121
- 22
@@ -58,6 +58,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
5858
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1269218?v=4' width='36' height='36' alt='@Jokipii'>`
5959
- `@Jokipii <https://github.com/Jokipii>`_
6060
- 1
61+
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>`
62+
- `@baby-gnu <https://github.com/baby-gnu>`_
63+
- 1
6164
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
6265
- `@johnkeates <https://github.com/johnkeates>`_
6366
- 1
@@ -83,4 +86,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
8386

8487
----
8588

86-
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-07-24.
89+
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-07-25.

docs/CHANGELOG.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@
22
Changelog
33
=========
44

5+
`3.1.1 <https://github.com/saltstack-formulas/template-formula/compare/v3.1.0...v3.1.1>`_ (2019-07-25)
6+
----------------------------------------------------------------------------------------------------------
7+
8+
Bug Fixes
9+
^^^^^^^^^
10+
11+
12+
* **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>`_
13+
14+
Documentation
15+
^^^^^^^^^^^^^
16+
17+
18+
* **tofs:** ensure merged will all recent changes (\ `6a614d9 <https://github.com/saltstack-formulas/template-formula/commit/6a614d9>`_\ )
19+
* **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>`_
20+
521
`3.1.0 <https://github.com/saltstack-formulas/template-formula/compare/v3.0.9...v3.1.0>`_ (2019-07-24)
622
----------------------------------------------------------------------------------------------------------
723

0 commit comments

Comments
 (0)