chore(release): 1.2.0 [skip ci]

# [1.2.0](v1.1.0...v1.2.0) (2021-05-11) ### Continuous Integration * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([95523a9](95523a9)) * **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([1d237e8](1d237e8)) * **travis:** maintain sync with GitLab CI [skip ci] ([5c81ca1](5c81ca1)), closes [#146](#146) ### Features * **agent:** allow use of string Server and ServerActive ([59dff0a](59dff0a))
saltstack-formulas · May 11, 2021 · 7cd3cf5 · 7cd3cf5
1 parent 8acddff
commit 7cd3cf5
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -4,12 +4,12 @@ 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)|86
+<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)|89
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3899078?v=4' width='36' height='36' alt='@moreda'>|[@moreda](https://github.com/moreda)|52
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12057348?v=4' width='36' height='36' alt='@xenadmin'>|[@xenadmin](https://github.com/xenadmin)|34
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/904839?v=4' width='36' height='36' alt='@landergate'>|[@landergate](https://github.com/landergate)|27
 <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)|22
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/807283?v=4' width='36' height='36' alt='@hatifnatt'>|[@hatifnatt](https://github.com/hatifnatt)|19
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/807283?v=4' width='36' height='36' alt='@hatifnatt'>|[@hatifnatt](https://github.com/hatifnatt)|20
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13771180?v=4' width='36' height='36' alt='@absmith82'>|[@absmith82](https://github.com/absmith82)|6
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1566437?v=4' width='36' height='36' alt='@bkmit'>|[@bkmit](https://github.com/bkmit)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/571226?v=4' width='36' height='36' alt='@ninjix'>|[@ninjix](https://github.com/ninjix)|4
@@ -45,4 +45,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-04-16.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-05-11.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+# [1.2.0](https://github.com/saltstack-formulas/zabbix-formula/compare/v1.1.0...v1.2.0) (2021-05-11)
+
+
+### Continuous Integration
+
+* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([95523a9](https://github.com/saltstack-formulas/zabbix-formula/commit/95523a9df12d511e69f00faecdd55d478540a7cd))
+* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([1d237e8](https://github.com/saltstack-formulas/zabbix-formula/commit/1d237e8fcf14bd81126c5ab7cf38d0a5fd701cc9))
+* **travis:** maintain sync with GitLab CI [skip ci] ([5c81ca1](https://github.com/saltstack-formulas/zabbix-formula/commit/5c81ca16808d3541690be282a1f96e410d68d848)), closes [#146](https://github.com/saltstack-formulas/zabbix-formula/issues/146)
+
+
+### Features
+
+* **agent:** allow use of string Server and ServerActive ([59dff0a](https://github.com/saltstack-formulas/zabbix-formula/commit/59dff0ace5ff83fd6996845e554dfbce7c9d1a75))
+
 # [1.1.0](https://github.com/saltstack-formulas/zabbix-formula/compare/v1.0.5...v1.1.0) (2021-04-16)
 
 

diff --git a/FORMULA b/FORMULA
@@ -1,7 +1,7 @@
 name: zabbix
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, FreeBSD, Windows
 os_family: Debian, RedHat, FreeBSD, Windows
-version: 1.1.0
+version: 1.2.0
 release: 1
 minimum_version: 2018.3
 summary: Formula for installing Zabbix

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>`_
-     - 86
+     - 89
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3899078?v=4' width='36' height='36' alt='@moreda'>`
      - `@moreda <https://github.com/moreda>`_
      - 52
@@ -30,7 +30,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
      - 22
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/807283?v=4' width='36' height='36' alt='@hatifnatt'>`
      - `@hatifnatt <https://github.com/hatifnatt>`_
-     - 19
+     - 20
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13771180?v=4' width='36' height='36' alt='@absmith82'>`
      - `@absmith82 <https://github.com/absmith82>`_
      - 6
@@ -131,4 +131,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-04-16.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-05-11.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,6 +2,23 @@
 Changelog
 =========
 
+`1.2.0 <https://github.com/saltstack-formulas/zabbix-formula/compare/v1.1.0...v1.2.0>`_ (2021-05-11)
+--------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `95523a9 <https://github.com/saltstack-formulas/zabbix-formula/commit/95523a9df12d511e69f00faecdd55d478540a7cd>`_\ )
+* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `1d237e8 <https://github.com/saltstack-formulas/zabbix-formula/commit/1d237e8fcf14bd81126c5ab7cf38d0a5fd701cc9>`_\ )
+* **travis:** maintain sync with GitLab CI [skip ci] (\ `5c81ca1 <https://github.com/saltstack-formulas/zabbix-formula/commit/5c81ca16808d3541690be282a1f96e410d68d848>`_\ ), closes `#146 <https://github.com/saltstack-formulas/zabbix-formula/issues/146>`_
+
+Features
+^^^^^^^^
+
+
+* **agent:** allow use of string Server and ServerActive (\ `59dff0a <https://github.com/saltstack-formulas/zabbix-formula/commit/59dff0ace5ff83fd6996845e554dfbce7c9d1a75>`_\ )
+
 `1.1.0 <https://github.com/saltstack-formulas/zabbix-formula/compare/v1.0.5...v1.1.0>`_ (2021-04-16)
 --------------------------------------------------------------------------------------------------------