From 698d6ae3af91db3b61acb034e78eb10517bd541a Mon Sep 17 00:00:00 2001 From: N Date: Fri, 24 Jan 2020 00:56:43 +0000 Subject: [PATCH 1/4] chore(cleanup): delete unused directory --- salt/pkgrepo/nop/clean.sls | 7 ------- salt/pkgrepo/nop/init.sls | 5 ----- salt/pkgrepo/nop/install.sls | 7 ------- 3 files changed, 19 deletions(-) delete mode 100644 salt/pkgrepo/nop/clean.sls delete mode 100644 salt/pkgrepo/nop/init.sls delete mode 100644 salt/pkgrepo/nop/install.sls diff --git a/salt/pkgrepo/nop/clean.sls b/salt/pkgrepo/nop/clean.sls deleted file mode 100644 index f535f7f..0000000 --- a/salt/pkgrepo/nop/clean.sls +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -salt-pkgrepo-clean-saltstack-norepo-{{ grains['os_family']|lower }}: - test.show_notification: - - text: | - No official repository for {{ grains['os_family'] }} diff --git a/salt/pkgrepo/nop/init.sls b/salt/pkgrepo/nop/init.sls deleted file mode 100644 index d3e5518..0000000 --- a/salt/pkgrepo/nop/init.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -include: - - .install diff --git a/salt/pkgrepo/nop/install.sls b/salt/pkgrepo/nop/install.sls deleted file mode 100644 index 55e3907..0000000 --- a/salt/pkgrepo/nop/install.sls +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls - -salt-pkgrepo-install-saltstack-norepo-{{ grains['os_family']|lower }}: - test.show_notification: - - text: | - No official repository for {{ grains['os_family'] }} From c42125c2ab1563b64e4768cf80955401a40a86ea Mon Sep 17 00:00:00 2001 From: N Date: Thu, 23 Jan 2020 23:51:05 +0000 Subject: [PATCH 2/4] test(versions): bump salt pkg versions --- test/integration/v201803-py2/controls/pkgs_spec.rb | 4 ++-- test/integration/v201902-py2/controls/pkgs_spec.rb | 4 ++-- test/integration/v201902-py3/controls/pkgs_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/v201803-py2/controls/pkgs_spec.rb b/test/integration/v201803-py2/controls/pkgs_spec.rb index f9e748b..72f3d74 100644 --- a/test/integration/v201803-py2/controls/pkgs_spec.rb +++ b/test/integration/v201803-py2/controls/pkgs_spec.rb @@ -3,9 +3,9 @@ version = case platform[:family] when 'redhat' - '2018.3.4-1.el7' + '2018.3.5-1.el7' when 'debian' - '2018.3.4+ds-1' + '2018.3.5+ds-1' end control 'salt packages' do diff --git a/test/integration/v201902-py2/controls/pkgs_spec.rb b/test/integration/v201902-py2/controls/pkgs_spec.rb index 2c57bc6..4c83c47 100644 --- a/test/integration/v201902-py2/controls/pkgs_spec.rb +++ b/test/integration/v201902-py2/controls/pkgs_spec.rb @@ -3,9 +3,9 @@ version = case platform[:family] when 'redhat' - '2019.2.2-1.el7' + '2019.2.3-1.el7' when 'debian' - '2019.2.2+ds-1' + '2019.2.3+ds-1' end control 'salt packages' do diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index cf4e765..bdc268b 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -12,9 +12,9 @@ version = when 'fedora' '2019.2.1rc0-3.fc31' when 'suse' - '2019.2.0-lp151.5.6.1' + '2019.2.0-lp151.5.9.1' when 'debian' - '2019.2.2+ds-1' + '2019.2.3+ds-1' end control 'salt packages' do From 7121d1d8cd67230a9f9dabecd1a6e11a14cfa109 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 24 Jan 2020 10:33:50 +0000 Subject: [PATCH 3/4] test(pkgs_spec): update `centos-8` for `2019.2.3` release * https://docs.saltstack.com/en/latest/topics/releases/2019.2.3.html --- test/integration/v201902-py3/controls/pkgs_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index bdc268b..c742d6d 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -7,7 +7,7 @@ version = when 'amazon' '2019.2.2-1.el7' when 'centos' - '2019.2.2-1.el8' + '2019.2.3-1.el8' end when 'fedora' '2019.2.1rc0-3.fc31' From 779b21fcaa478ab02049c416a1c684a61debb7c6 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 24 Jan 2020 11:12:51 +0000 Subject: [PATCH 4/4] chore(release): 1.1.1 [skip ci] ## [1.1.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.0...v1.1.1) (2020-01-24) ### Continuous Integration * **travis:** use `major.minor` for `semantic-release` version [skip ci] ([9d30df2](https://github.com/saltstack-formulas/salt-formula/commit/9d30df2f5f7405b9e354203f22a524b79a44ac15)) ### Tests * **pkgs_spec:** update `centos-8` for `2019.2.3` release ([7121d1d](https://github.com/saltstack-formulas/salt-formula/commit/7121d1d8cd67230a9f9dabecd1a6e11a14cfa109)) * **versions:** bump salt pkg versions ([c42125c](https://github.com/saltstack-formulas/salt-formula/commit/c42125c2ab1563b64e4768cf80955401a40a86ea)) --- AUTHORS.md | 6 +++--- CHANGELOG.md | 13 +++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 10 +++++----- docs/CHANGELOG.rst | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index fbef2f1..43bf7ba 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -6,15 +6,15 @@ Avatar|Contributor|Contributions :-:|---|:-: @aboe76|[@aboe76](https://github.com/aboe76)|100 @gravyboat|[@gravyboat](https://github.com/gravyboat)|71 -@myii|[@myii](https://github.com/myii)|66 +@myii|[@myii](https://github.com/myii)|68 @nmadhok|[@nmadhok](https://github.com/nmadhok)|54 @iggy|[@iggy](https://github.com/iggy)|22 @puneetk|[@puneetk](https://github.com/puneetk)|21 @javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|20 @xenophonf|[@xenophonf](https://github.com/xenophonf)|18 @andrew-vant|[@andrew-vant](https://github.com/andrew-vant)|13 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|13 @whiteinge|[@whiteinge](https://github.com/whiteinge)|12 -@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|12 @rhertzog|[@rhertzog](https://github.com/rhertzog)|11 @pcdummy|[@pcdummy](https://github.com/pcdummy)|11 @babilen5|[@babilen5](https://github.com/babilen5)|8 @@ -107,4 +107,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-12-19. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-01-24. diff --git a/CHANGELOG.md b/CHANGELOG.md index 68bb4c2..0d774fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.1.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.1.0...v1.1.1) (2020-01-24) + + +### Continuous Integration + +* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([9d30df2](https://github.com/saltstack-formulas/salt-formula/commit/9d30df2f5f7405b9e354203f22a524b79a44ac15)) + + +### Tests + +* **pkgs_spec:** update `centos-8` for `2019.2.3` release ([7121d1d](https://github.com/saltstack-formulas/salt-formula/commit/7121d1d8cd67230a9f9dabecd1a6e11a14cfa109)) +* **versions:** bump salt pkg versions ([c42125c](https://github.com/saltstack-formulas/salt-formula/commit/c42125c2ab1563b64e4768cf80955401a40a86ea)) + # [1.1.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.0.0...v1.1.0) (2019-12-19) diff --git a/FORMULA b/FORMULA index 03e9aef..70a5b56 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: salt os: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows -version: 1.1.0 +version: 1.1.1 release: 1 minimum_version: 2015.8 summary: Formula for install Saltstack diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index b313b0e..2d3887d 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -21,7 +21,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 71 * - :raw-html-m2r:`@myii` - `@myii `_ - - 66 + - 68 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 54 @@ -40,11 +40,11 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@andrew-vant` - `@andrew-vant `_ - 13 - * - :raw-html-m2r:`@whiteinge` - - `@whiteinge `_ - - 12 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ + - 13 + * - :raw-html-m2r:`@whiteinge` + - `@whiteinge `_ - 12 * - :raw-html-m2r:`@rhertzog` - `@rhertzog `_ @@ -317,4 +317,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-12-19. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-01-24. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 61afcd5..eaa9a6e 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`1.1.1 `_ (2020-01-24) +------------------------------------------------------------------------------------------------------ + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **travis:** use ``major.minor`` for ``semantic-release`` version [skip ci] (\ `9d30df2 `_\ ) + +Tests +^^^^^ + + +* **pkgs_spec:** update ``centos-8`` for ``2019.2.3`` release (\ `7121d1d `_\ ) +* **versions:** bump salt pkg versions (\ `c42125c `_\ ) + `1.1.0 `_ (2019-12-19) ------------------------------------------------------------------------------------------------------