From 03465e75ba938a11e9f9c85b7829f7dea9713642 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Thu, 12 Nov 2015 23:13:00 -0600
Subject: add changelog for #2119

---
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 77b8e9298..a17c7e1e6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -235,6 +235,10 @@ Bug Fixes
 - 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
 ------------
 
-- 
cgit v1.2.3