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)
saltstack-formulas · Oct 20, 2021 · 86dc3b3 · 86dc3b3
1 parent cde7c5b
commit 86dc3b3
Show file tree

Hide file tree

Showing 9 changed files with 222 additions and 146 deletions.
diff --git 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
 :-:|---|:-:
-<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
+<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
 <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
 <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
 <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
 <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
 <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
 <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
+<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
 <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
 <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
 <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
 <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
 <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
 <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
-<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
 <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
 <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
 <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
 
 ---
 
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-08-28.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-10-20.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [1.2.1](https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1) (2021-10-20)
+
+
+### Bug Fixes
+
+* **vhosts:** reset `cleanup` to previous and use dedicated `clean` SLS ([0c6c1d3](https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73))
+
+
+### Continuous Integration
+
+* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([a3d49f1](https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d))
+* test for upstream Salt regressions in `master` instances (2021-W37a) ([69dcfd9](https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c))
+
+
+### Documentation
+
+* **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)
+
 # [1.2.0](https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0) (2021-08-28)
 
 

diff --git a/FORMULA b/FORMULA
@@ -1,7 +1,7 @@
 name: apache
 os: RedHat, Fedora, CentOS, Debian, Ubuntu, Suse, FreeBSD
 os_family: RedHat, Debian, Suse, FreeBSD
-version: 1.2.0
+version: 1.2.1
 release: 1
 minimum_version: 2015.8
 summary: Formula for installing Apache

diff --git 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:`<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
+     - 145
    * - :raw-html-m2r:`<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
@@ -121,6 +121,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<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
+   * - :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'>`
+     - `@Yoda-BZH <https://github.com/Yoda-BZH>`_
+     - 3
    * - :raw-html-m2r:`<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
@@ -253,9 +256,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<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
-   * - :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'>`
-     - `@Yoda-BZH <https://github.com/Yoda-BZH>`_
-     - 1
    * - :raw-html-m2r:`<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
@@ -287,4 +287,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
 
 ----
 
-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-08-28.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-10-20.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,6 +2,28 @@
 Changelog
 =========
 
+`1.2.1 <https://github.com/saltstack-formulas/apache-formula/compare/v1.2.0...v1.2.1>`_ (2021-10-20)
+--------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **vhosts:** reset ``cleanup`` to previous and use dedicated ``clean`` SLS (\ `0c6c1d3 <https://github.com/saltstack-formulas/apache-formula/commit/0c6c1d36e261ae6f851cb9b6ed2d1319af460a73>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `a3d49f1 <https://github.com/saltstack-formulas/apache-formula/commit/a3d49f185274efc6d1530580daf03b1ad2be0e2d>`_\ )
+* test for upstream Salt regressions in ``master`` instances (2021-W37a) (\ `69dcfd9 <https://github.com/saltstack-formulas/apache-formula/commit/69dcfd9c3bf49416e6c77d8e982446d99af3b95c>`_\ )
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **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>`_
+
 `1.2.0 <https://github.com/saltstack-formulas/apache-formula/compare/v1.1.8...v1.2.0>`_ (2021-08-28)
 --------------------------------------------------------------------------------------------------------
 

diff --git a/docs/antora.yml b/docs/antora.yml
@@ -1,7 +1,7 @@
 ---
 name: 'apache-formula'
 title: 'apache-formula'
-version: '1.2.0'
+version: '1.2.1'
 start_page: 'README.adoc'
 nav:
   - 'modules/ROOT/nav-repo-docs.adoc'

diff --git a/docs/modules/ROOT/pages/AUTHORS.adoc b/docs/modules/ROOT/pages/AUTHORS.adoc
@@ -12,7 +12,7 @@ _descending_ order.
 
 |image::https://avatars.githubusercontent.com/u/10231489?v=4[@myii,36,36]
 |https://github.com/myii[@myii^]
-|124 
+|145 
 
 |image::https://avatars.githubusercontent.com/u/1920805?v=4[@alxwr,36,36]
 |https://github.com/alxwr[@alxwr^]
@@ -154,6 +154,10 @@ _descending_ order.
 |https://github.com/vincentfretin[@vincentfretin^]
 |3
 
+|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
+|https://github.com/Yoda-BZH[@Yoda-BZH^]
+|3 
+
 |image::https://avatars.githubusercontent.com/u/1079875?v=4[@bogdanr,36,36]
 |https://github.com/bogdanr[@bogdanr^]
 |2 
@@ -331,10 +335,6 @@ _descending_ order.
 |https://github.com/wido[@wido^]
 |1 
 
-|image::https://avatars.githubusercontent.com/u/751889?v=4[@Yoda-BZH,36,36]
-|https://github.com/Yoda-BZH[@Yoda-BZH^]
-|1 
-
 |image::https://avatars.githubusercontent.com/u/9978732?v=4[@abehling,36,36]
 |https://github.com/abehling[@abehling^]
 |1 
@@ -376,4 +376,4 @@ _descending_ order.
 
 Auto-generated by a https://github.com/myii/maintainer[forked version^]
 of https://github.com/gaocegege/maintainer[gaocegege/maintainer^] on
-2021-08-28.
+2021-10-20.