summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Stroh <rennpferd@gmail.com>2015-06-11 00:49:06 +0200
committerIgor Stroh <rennpferd@gmail.com>2015-06-11 00:49:06 +0200
commitf827882a98881c81794ceebe22c63c98f140145a (patch)
tree34db40d5d20aa3140e5b5db768ad3b8d599b979d
parent6211d968ea4d3f05db332b724ca0e984c9691eea (diff)
downloadpyramid-f827882a98881c81794ceebe22c63c98f140145a.tar.gz
pyramid-f827882a98881c81794ceebe22c63c98f140145a.tar.bz2
pyramid-f827882a98881c81794ceebe22c63c98f140145a.zip
added appropriate contributors and changes entries
-rw-r--r--CHANGES.txt6
-rw-r--r--CONTRIBUTORS.txt2
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 87e9f1f3a..9ed486b26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,12 @@
Features
--------
+- pcreate will now ask for confirmation if invoked with
+ an argument for a project name that already exists or
+ is importable in the current environment.
+ See https://github.com/Pylons/pyramid/issues/1357 and
+ https://github.com/Pylons/pyramid/pull/1837
+
- Make it possible to subclass ``pyramid.request.Request`` and also use
``pyramid.request.Request.add_request.method``. See
https://github.com/Pylons/pyramid/issues/1529
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8eadbeecf..3405612ef 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -248,3 +248,5 @@ Contributors
- Donald Stufft, 2015/03/15
- Karen Dalton, 2015/06/01
+
+- Igor Stroh, 2015/06/10