From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 30 Nov 2015 17:40:51 +0000 (-0500)
Subject: - update changelog for all the py3.5/3.6 related prs at once
X-Git-Tag: rel_1_1_0b1~84^2~70^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c5ba60269c835fba61ff7e8aadfbad1e3edd1b8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- update changelog for all the py3.5/3.6 related prs at once

(cherry picked from commit 4bb6770ae872b69bd65ba0d67a7e1453d1a4e14b)
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 537f750ca3..b7b792d4d5 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -31,12 +31,13 @@
     .. change::
         :tags: bug, py3k
         :versions: 1.1.0b1
-        :pullreq: github:210
+        :pullreq: github:210, github:218, github:211
 
-        Updates to internal getargspec() calls, as well as some py36-related
-        fixture updates, to allow tests to pass without
-        warnings on Py3.5, Py3.6, pull requests courtesy Jacob MacDonald
-        and Luri de Silvio.
+        Updates to internal getargspec() calls, some py36-related
+        fixture updates, and alterations to two iterators to "return" instead
+        of raising StopIteration, to allow tests to pass without
+        errors or warnings on Py3.5, Py3.6, pull requests courtesy
+        Jacob MacDonald, Luri de Silvio, and Phil Jones.
 
     .. change::
         :tags: bug, ext