diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 700514d8f..8aa15f09c 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,16 @@ Changelog history ================= +unreleased +---------- + +- 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 +- Do not delete pid file during restart - #1116 +- Fix graceful_timeout watcher config option type - #1115 + 0.16.1 2019-12-27 ----------------- Fix packaging issue. 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 ======================