From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Nov 2016 17:03:13 +0000 (-0500)
Subject: - oragnize the changelog with tokens per .. change:: to allow
X-Git-Tag: rel_1_1_4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e7d46fe1dc037a4817667813abb0a0bf164a1a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- oragnize the changelog with tokens per .. change:: to allow
three way merges to succeed (hopefully). requires bump of changelog
package.

Change-Id: Icd9bb7f4a4e01cc6ac66e8c7bb6631c3f6bb1d2c
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 532e868460..b0a36080d9 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -97,6 +97,7 @@
     .. 3778
 
     .. change::
+        :tags: bug, orm
         :tickets: 3778
         :versions: 1.1.4
 
diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 1123e084e3..7c2e0a8faa 100644
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -21,7 +21,7 @@
 .. changelog::
     :version: 1.1.4
 
-    .. change::
+    .. change::  default_schema
         :tags: bug, engine
 
         Removed long-broken "default_schema_name()" method from
@@ -29,14 +29,14 @@
         version and was non-working (e.g. would raise).  Pull request
         courtesy Benjamin Dopplinger.
 
-    .. change::
+    .. change:: pragma
         :tags: bug, sqlite
 
         Added quotes to the PRAGMA directives in the pysqlcipher dialect
         to support additional cipher arguments appropriately.  Pull request
         courtesy Kevin Jurczyk.
 
-    .. change::
+    .. change:: 3846
         :tags: bug, postgresql
         :tickets: 3846, 3807
 
@@ -47,7 +47,7 @@
         CONFLICT itself.   This was an incorrect assumption, so that portion
         of the change in :ticket:`3807` is rolled back.
 
-    .. change::
+    .. change:: 3845
         :tags: bug, orm
         :tickets: 3845
 
@@ -55,7 +55,7 @@
         strategy would cause backrefs and/or back_populates options to be
         ignored.
 
-    .. change::
+    .. change:: sscursor_mysql
         :tags: feature, mysql
 
         Added support for server side cursors to the mysqlclient and
diff --git a/doc/build/requirements.txt b/doc/build/requirements.txt
index d1eb23d0fe..94657001ff 100644
--- a/doc/build/requirements.txt
+++ b/doc/build/requirements.txt
@@ -1,3 +1,3 @@
-changelog>=0.3.4
+changelog>=0.3.5
 sphinx-paramlinks>=0.2.2
 git+https://bitbucket.org/zzzeek/zzzeeksphinx.git@HEAD#egg=zzzeeksphinx