summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2015-11-12 22:32:52 -0700
committerBert JW Regeer <bertjw@regeer.org>2015-11-12 22:32:52 -0700
commitdcb01c04929aa8afb065b397f36db5982afc4834 (patch)
tree1a7f26e385246422809de4baf89db7f2ab2ef327 /CHANGES.txt
parent203cf3accd0bec0cc08eab8e736f26cd0e711d8b (diff)
parent2cb0419e3ebcfc4c6671d0325b7fb280bc986001 (diff)
downloadpyramid-dcb01c04929aa8afb065b397f36db5982afc4834.tar.gz
pyramid-dcb01c04929aa8afb065b397f36db5982afc4834.tar.bz2
pyramid-dcb01c04929aa8afb065b397f36db5982afc4834.zip
Merge branch 'master' into feature/int_conversion_check
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt15
1 files changed, 12 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index aefb166dc..739eb870d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -237,12 +237,20 @@ Bug Fixes
``timeout``, ``reissue_time``, ``max_age`` that expect an integer value.
See https://github.com/Pylons/pyramid/pull/2050
+- Fixed usage of ``pserve --monitor-restart --daemon`` which would fail in
+ horrible ways. See https://github.com/Pylons/pyramid/pull/2118
+
+- Explicitly prevent ``pserve --reload --daemon`` from being used. It's never
+ been supported but would work and fail in weird ways.
+ See https://github.com/Pylons/pyramid/pull/2119
+
Deprecations
------------
-- The ``pserve`` command's daemonization features have been deprecated. This
- includes the ``[start,stop,restart,status]`` subcommands as well as the
- ``--daemon``, ``--stop-server``, ``--pid-file``, and ``--status`` flags.
+- The ``pserve`` command's daemonization features have been deprecated as well
+ as ``--monitor-restart``. This includes the ``[start,stop,restart,status]``
+ subcommands as well as the ``--daemon``, ``--stop-daemon``, ``--pid-file``,
+ and ``--status`` flags.
Please use a real process manager in the future instead of relying on the
``pserve`` to daemonize itself. Many options exist including your Operating
@@ -250,6 +258,7 @@ Deprecations
solutions like Circus and Supervisor.
See https://github.com/Pylons/pyramid/pull/1641
+ and https://github.com/Pylons/pyramid/pull/2120
- Renamed the ``principal`` argument to ``pyramid.security.remember()`` to
``userid`` in order to clarify its intended purpose.