diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-01-05 18:25:24 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-01-05 18:25:24 -0500 |
| commit | 60c00d7c1ad521bccb4fca1f318da167bf72532e (patch) | |
| tree | 664a36b27ee90598abaced0fd912097c5764f630 | |
| parent | f89d4d216bd7605c920b7b8a10ecde6bfea2238c (diff) | |
| download | sqlalchemy-60c00d7c1ad521bccb4fca1f318da167bf72532e.tar.gz | |
fix the changelog merge
| -rw-r--r-- | doc/build/changelog/changelog_09.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst index ea3849934..4ba3b7129 100644 --- a/doc/build/changelog/changelog_09.rst +++ b/doc/build/changelog/changelog_09.rst @@ -43,7 +43,7 @@ :ref:`automap_toplevel` .. change:: - :tags: feature, core + :tags: feature, sql Conjunctions like :func:`.and_` and :func:`.or_` can now accept Python generators as a single argument, e.g.:: @@ -54,12 +54,11 @@ element is an instance of ``types.GeneratorType``. .. change:: - :tags: feature, core + :tags: feature, schema The :paramref:`.Table.extend_existing` and :paramref:`.Table.autoload_replace` parameters are now available on the :meth:`.MetaData.reflect` method. ->>>>>>> automap .. change:: :tags: bug, orm, declarative |