]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit
merge tip
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 14 Nov 2010 22:54:47 +0000 (17:54 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 14 Nov 2010 22:54:47 +0000 (17:54 -0500)
commitf252af2b21c5bafeaa30aabcf65dfed9b5c01093
treedd5bf4f56ac68d78edfcb37a9c0c3c380c8ef6a8
parent9d7158a2c3869ad7a1ab07d3a41e831f6806a68c
parent06bf218ed37ca780bc4de2ceb47769c84de70ba1
merge tip
12 files changed:
lib/sqlalchemy/ext/declarative.py
lib/sqlalchemy/orm/attributes.py
lib/sqlalchemy/orm/dynamic.py
lib/sqlalchemy/orm/interfaces.py
lib/sqlalchemy/orm/mapper.py
lib/sqlalchemy/orm/properties.py
lib/sqlalchemy/orm/query.py
lib/sqlalchemy/orm/scoping.py
lib/sqlalchemy/orm/strategies.py
lib/sqlalchemy/orm/util.py
test/orm/test_mapper.py
test/orm/test_query.py