Skip to content

Commit 86dc3b3

Browse files
chore(release): 1.2.1 [skip ci]
## [1.2.1](v1.2.0...v1.2.1) (2021-10-20) ### Bug Fixes * **vhosts:** reset `cleanup` to previous and use dedicated `clean` SLS ([0c6c1d3](0c6c1d3)) ### Continuous Integration * **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([a3d49f1](a3d49f1)) * test for upstream Salt regressions in `master` instances (2021-W37a) ([69dcfd9](69dcfd9)) ### Documentation * **readme:** document vhosts clean/cleanup ([2d72dff](2d72dff)), closes [#372](#372)
1 parent cde7c5b commit 86dc3b3

File tree

9 files changed

+222
-146
lines changed

9 files changed

+222
-146
lines changed

AUTHORS.md

Lines changed: 3 additions & 3 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://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|124
7+
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|145
88
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|40
99
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|36
1010
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|32
@@ -40,6 +40,7 @@ Avatar|Contributor|Contributions
4040
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/228723?v=4' width='36' height='36' alt='@abednarik'>|[@abednarik](https://github.com/abednarik)|3
4141
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12513495?v=4' width='36' height='36' alt='@dexbleeker'>|[@dexbleeker](https://github.com/dexbleeker)|3
4242
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/112249?v=4' width='36' height='36' alt='@vincentfretin'>|[@vincentfretin](https://github.com/vincentfretin)|3
43+
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|3
4344
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>|[@bogdanr](https://github.com/bogdanr)|2
4445
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/11229682?v=4' width='36' height='36' alt='@carlovollebregt'>|[@carlovollebregt](https://github.com/carlovollebregt)|2
4546
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4313010?v=4' width='36' height='36' alt='@thornycrackers'>|[@thornycrackers](https://github.com/thornycrackers)|2
@@ -84,7 +85,6 @@ Avatar|Contributor|Contributions
8485
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4156131?v=4' width='36' height='36' alt='@skylerberg'>|[@skylerberg](https://github.com/skylerberg)|1
8586
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7967223?v=4' width='36' height='36' alt='@TiepiNL'>|[@TiepiNL](https://github.com/TiepiNL)|1
8687
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/326786?v=4' width='36' height='36' alt='@wido'>|[@wido](https://github.com/wido)|1
87-
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|1
8888
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9978732?v=4' width='36' height='36' alt='@abehling'>|[@abehling](https://github.com/abehling)|1
8989
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1021809?v=4' width='36' height='36' alt='@ardin'>|[@ardin](https://github.com/ardin)|1
9090
<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17029228?v=4' width='36' height='36' alt='@mcarlton00'>|[@mcarlton00](https://github.com/mcarlton00)|1
@@ -97,4 +97,4 @@ Avatar|Contributor|Contributions
9797

9898
---
9999

100-
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-08-28.
100+
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-10-20.

CHANGELOG.md

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

3+
## [1.2.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1) (2021-10-20)
4+
5+
6+
### Bug Fixes
7+
8+
* **vhosts:** reset `cleanup` to previous and use dedicated `clean` SLS ([0c6c1d3](https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73))
9+
10+
11+
### Continuous Integration
12+
13+
* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([a3d49f1](https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d))
14+
* test for upstream Salt regressions in `master` instances (2021-W37a) ([69dcfd9](https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c))
15+
16+
17+
### Documentation
18+
19+
* **readme:** document vhosts clean/cleanup ([2d72dff](https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d)), closes [#372](https://github.com/saltstack-formulas/apache-formula/issues/372)
20+
321
# [1.2.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0) (2021-08-28)
422

523

FORMULA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: apache
22
os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD
33
os_family: RedHat, Debian, Suse, FreeBSD
4-
version: 1.2.0
4+
version: 1.2.1
55
release: 1
66
minimum_version: 2015.8
77
summary: Formula for installing Apache

docs/AUTHORS.rst

Lines changed: 5 additions & 5 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://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
1717
- `@myii <https://github.com/myii>`_
18-
- 124
18+
- 145
1919
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
2020
- `@alxwr <https://github.com/alxwr>`_
2121
- 40
@@ -121,6 +121,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
121121
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/112249?v=4' width='36' height='36' alt='@vincentfretin'>`
122122
- `@vincentfretin <https://github.com/vincentfretin>`_
123123
- 3
124+
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
125+
- `@Yoda-BZH <https://github.com/Yoda-BZH>`_
126+
- 3
124127
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>`
125128
- `@bogdanr <https://github.com/bogdanr>`_
126129
- 2
@@ -253,9 +256,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
253256
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/326786?v=4' width='36' height='36' alt='@wido'>`
254257
- `@wido <https://github.com/wido>`_
255258
- 1
256-
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
257-
- `@Yoda-BZH <https://github.com/Yoda-BZH>`_
258-
- 1
259259
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9978732?v=4' width='36' height='36' alt='@abehling'>`
260260
- `@abehling <https://github.com/abehling>`_
261261
- 1
@@ -287,4 +287,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
287287

288288
----
289289

290-
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-08-28.
290+
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-10-20.

docs/CHANGELOG.rst

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

5+
`1.2.1 <https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1>`_ (2021-10-20)
6+
--------------------------------------------------------------------------------------------------------
7+
8+
Bug Fixes
9+
^^^^^^^^^
10+
11+
12+
* **vhosts:** reset ``cleanup`` to previous and use dedicated ``clean`` SLS (\ `0c6c1d3 <https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73>`_\ )
13+
14+
Continuous Integration
15+
^^^^^^^^^^^^^^^^^^^^^^
16+
17+
18+
* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `a3d49f1 <https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d>`_\ )
19+
* test for upstream Salt regressions in ``master`` instances (2021-W37a) (\ `69dcfd9 <https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c>`_\ )
20+
21+
Documentation
22+
^^^^^^^^^^^^^
23+
24+
25+
* **readme:** document vhosts clean/cleanup (\ `2d72dff <https://github.com/saltstack-formulas/apache-formula/commit/2d72dff82bdcf9c0d30f6735c315a655ebea483d>`_\ ), closes `#372 <https://github.com/saltstack-formulas/apache-formula/issues/372>`_
26+
527
`1.2.0 <https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0>`_ (2021-08-28)
628
--------------------------------------------------------------------------------------------------------
729

docs/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: 'apache-formula'
33
title: 'apache-formula'
4-
version: '1.2.0'
4+
version: '1.2.1'
55
start_page: 'README.adoc'
66
nav:
77
- 'modules/ROOT/nav-repo-docs.adoc'

docs/modules/ROOT/pages/AUTHORS.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _descending_ order.
1212

1313
|image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36]
1414
|https://github.com/myii[@myii^]
15-
|124
15+
|145
1616

1717
|image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36]
1818
|https://github.com/alxwr[@alxwr^]
@@ -154,6 +154,10 @@ _descending_ order.
154154
|https://github.com/vincentfretin[@vincentfretin^]
155155
|3
156156

157+
|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
158+
|https://github.com/Yoda-BZH[@Yoda-BZH^]
159+
|3
160+
157161
|image::https://avatars.githubusercontent.com/u/1079875?v=4[@bogdanr,36,36]
158162
|https://github.com/bogdanr[@bogdanr^]
159163
|2
@@ -331,10 +335,6 @@ _descending_ order.
331335
|https://github.com/wido[@wido^]
332336
|1
333337

334-
|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
335-
|https://github.com/Yoda-BZH[@Yoda-BZH^]
336-
|1
337-
338338
|image::https://avatars.githubusercontent.com/u/9978732?v=4[@abehling,36,36]
339339
|https://github.com/abehling[@abehling^]
340340
|1
@@ -376,4 +376,4 @@ _descending_ order.
376376

377377
Auto-generated by a https://github.com/myii/maintainer[forked version^]
378378
of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on
379-
2021-08-28.
379+
2021-10-20.

0 commit comments

Comments
 (0)