diff --git a/AUTHORS.md b/AUTHORS.md index f67f32a..90861e9 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|48 -@aboe76|[@aboe76](https://github.com/aboe76)|45 +@myii|[@myii](https://github.com/myii)|53 +@aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @@ -77,4 +77,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-11-25. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-22. diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ee3ab3..4ef6cee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.3.3](https://github.com/saltstack-formulas/nginx-formula/compare/v2.3.2...v2.3.3) (2019-12-22) + + +### Bug Fixes + +* **map.jinja:** use upstream default for `worker_connections` ([49caf8c](https://github.com/saltstack-formulas/nginx-formula/commit/49caf8cd69be49bd7773949c9f29e147732140a5)), closes [#261](https://github.com/saltstack-formulas/nginx-formula/issues/261) + + +### Continuous Integration + +* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([09be54d](https://github.com/saltstack-formulas/nginx-formula/commit/09be54d05fb3ce7cff039aa74633a3b29dcbbcee)) +* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([091c614](https://github.com/saltstack-formulas/nginx-formula/commit/091c61448dd068e2734869caeb91cedb6f4264e2)) +* **travis:** run `shellcheck` during lint job [skip ci] ([ccf64d9](https://github.com/saltstack-formulas/nginx-formula/commit/ccf64d9be2f0aa07dfb72ed25352197081e9e388)) +* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([facbaa1](https://github.com/saltstack-formulas/nginx-formula/commit/facbaa1e392de9238cf494964e57af73e1bf709a)) + ## [2.3.2](https://github.com/saltstack-formulas/nginx-formula/compare/v2.3.1...v2.3.2) (2019-11-25) diff --git a/FORMULA b/FORMULA index de764b6..21136a1 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.3.2 +version: 2.3.3 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 476235b..04675af 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 48 + - 53 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - - 45 + - 46 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 27 @@ -227,4 +227,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-11-25. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-12-22. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 61eec2f..2ab706b 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog ========= +`2.3.3 `_ (2019-12-22) +------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **map.jinja:** use upstream default for ``worker_connections`` (\ `49caf8c `_\ ), closes `#261 `_ + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile:** restrict ``train`` gem version until upstream fix [skip ci] (\ `09be54d `_\ ) +* **travis:** quote pathspecs used with ``git ls-files`` [skip ci] (\ `091c614 `_\ ) +* **travis:** run ``shellcheck`` during lint job [skip ci] (\ `ccf64d9 `_\ ) +* **travis:** use ``major.minor`` for ``semantic-release`` version [skip ci] (\ `facbaa1 `_\ ) + `2.3.2 `_ (2019-11-25) -------------------------------------------------------------------------------------------------------