]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
Merge branch 'master' into fdbsql-tests
authorScott Dugas <scott.dugas@foundationdb.com>
Mon, 3 Nov 2014 19:54:51 +0000 (14:54 -0500)
committerScott Dugas <scott.dugas@foundationdb.com>
Mon, 3 Nov 2014 19:54:51 +0000 (14:54 -0500)
commitb31ab006897d2709442f9745faf0cac6e0de1713
treea6b428e9ca7f1f67c5193581ecd82a83632eeb79
parentebb9d57cb385f49becbf54c6f78647715ddd1c29
parent7bf5ac9c1e814c999d4930941935e1d5cfd236bf
Merge branch 'master' into fdbsql-tests

Conflicts:
lib/sqlalchemy/testing/exclusions.py
lib/sqlalchemy/testing/engines.py
lib/sqlalchemy/testing/exclusions.py
test/orm/test_query.py
test/requirements.py
test/sql/test_metadata.py