summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-14 22:40:37 -0500
committerMichael Merickel <michael@merickel.org>2015-10-14 22:40:37 -0500
commit14a28d2dfd27aed3337fb756180befa15d94ea98 (patch)
tree5f6b9ae6050f3232ced1ef48b8793373f50bc62a /CHANGES.txt
parent31f899a4b477888a1b3e8e7ed6b83407e6a41d20 (diff)
parent9a68d072a440e91f5ada180404c6654e3eae93ae (diff)
downloadpyramid-14a28d2dfd27aed3337fb756180befa15d94ea98.tar.gz
pyramid-14a28d2dfd27aed3337fb756180befa15d94ea98.tar.bz2
pyramid-14a28d2dfd27aed3337fb756180befa15d94ea98.zip
Merge pull request #1907 from mnaberez/circus-as-pserve-daemonize-replacement
Mention Circus as a pserve --daemon replacement. Refs #1554, #1641
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8ed3e1137..b71af30cb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -218,8 +218,8 @@ Deprecations
Please use a real process manager in the future instead of relying on the
``pserve`` to daemonize itself. Many options exist including your Operating
- System's services such as systemd or upstart, as well as the excellent
- and simple supervisord.
+ System's services such as Systemd or Upstart, as well as Python-based
+ solutions like Circus and Supervisor.
See https://github.com/Pylons/pyramid/pull/1641