From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 13 Aug 2014 21:50:50 +0000 (-0400)
Subject: Merge branch 'pr126'
X-Git-Tag: rel_1_0_0b1~240
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=190961157d0e277ed7a7f965961ad1e75ea89e04;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge branch 'pr126'

Conflicts:
	doc/build/changelog/changelog_10.rst
---

190961157d0e277ed7a7f965961ad1e75ea89e04
diff --cc doc/build/changelog/changelog_10.rst
index 1d501f85be,7762534e87..20023af44d
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@@ -16,15 -16,14 +16,23 @@@
  .. changelog::
  	:version: 1.0.0
  
 +    .. change::
 +        :tags: sql, feature
 +        :tickets: 3027
 +        :pullrequest: bitbucket:29
 +
 +        The :paramref:`.Table.autoload_with` flag now implies that
 +        :paramref:`.Table.autoload` should be ``True``.  Pull request
 +        courtesy Malik Diarra.
 +
+     .. change::
+         :tags: postgresql, feature
+         :pullreq: github:126
+ 
+         Added new method :meth:`.PGInspector.get_enums`, when using the
+         inspector for Postgresql will provide a list of ENUM types.
+         Pull request courtesy Ilya Pekelny.
+ 
      .. change::
          :tags: mysql, bug