From c7606ef7d9094b17dd7eeb6f169c36e4f74e1fae Mon Sep 17 00:00:00 2001 From: Ivan Elfimov Date: Wed, 18 Mar 2020 22:50:43 +0300 Subject: [PATCH 1/4] Add 'unreleased' section in the changelog I added unreleased section to changelog after being inspired by [keepachangelog](https://keepachangelog.com/) project. --- docs/source/changelog.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 700514d8f..d2a2aef6e 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,14 @@ Changelog history ================= +unreleased +---------- + +- Speedup reloadconfig for large number of sockets - #834 +- Do not allow adding watchers with the same lowercase names - #936 +- Do not delete pid file during restart - #1080 +- Fix graceful_timeout watcher config option type - #1088 + 0.16.1 2019-12-27 ----------------- Fix packaging issue. From 3ae51e5b805125312bfe1a7dba10c86bbcb3d57c Mon Sep 17 00:00:00 2001 From: Ivan Elfimov Date: Wed, 18 Mar 2020 23:04:07 +0300 Subject: [PATCH 2/4] Add note to contributing guide with a reminder to add a changelog entry --- docs/source/contributing.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index 87b86df49..09f80ae5f 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -53,6 +53,9 @@ testsuite under the different supported python versions. Please use : http://issue2pr.herokuapp.com/ to reference a commit to an existing circus issue, if any. +Please also add a changelog entry in the 'unreleased' section with a short +description of the change and a reference to the issue (if any). + Avoiding merge commits ====================== From dc85b43024f51b095608195ab9a3c75f27f246d0 Mon Sep 17 00:00:00 2001 From: Ivan Elfimov Date: Fri, 10 Apr 2020 15:08:44 +0300 Subject: [PATCH 3/4] Fix pull request numbers, add more entries --- docs/source/changelog.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index d2a2aef6e..0229398c6 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -4,10 +4,12 @@ Changelog history unreleased ---------- -- Speedup reloadconfig for large number of sockets - #834 -- Do not allow adding watchers with the same lowercase names - #936 -- Do not delete pid file during restart - #1080 -- Fix graceful_timeout watcher config option type - #1088 +- Fix mem_info readings to be more reliable - #1127 +- Drop support for Python 2.7 & 3.4 - #1126 +- Speedup reloadconfig for large number of sockets - #1121 +- Do not allow adding watchers with the same lowercase names - #1117 +- Do not delete pid file during restart - #1116 +- Fix graceful_timeout watcher config option type - #1115 0.16.1 2019-12-27 ----------------- From 9f40518beed4c9873a47e1364d7d3404fa2a03b8 Mon Sep 17 00:00:00 2001 From: Ivan Elfimov Date: Fri, 10 Apr 2020 15:22:49 +0300 Subject: [PATCH 4/4] Fix pull request number --- docs/source/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 0229398c6..8aa15f09c 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -4,7 +4,7 @@ Changelog history unreleased ---------- -- Fix mem_info readings to be more reliable - #1127 +- Fix mem_info readings to be more reliable - #1128 - Drop support for Python 2.7 & 3.4 - #1126 - Speedup reloadconfig for large number of sockets - #1121 - Do not allow adding watchers with the same lowercase names - #1117