]> err.no Git - dak/commit
Merge branch 'master' into deb-src-3.0-sqla
authorChris Lamb <lamby@debian.org>
Tue, 27 Oct 2009 14:25:37 +0000 (14:25 +0000)
committerChris Lamb <lamby@debian.org>
Tue, 27 Oct 2009 14:25:37 +0000 (14:25 +0000)
commit32dc9d52c53207a6524ecf63ac7866435ae40374
tree871503d90608b4d91d27a5f778d914dc3fd5cfa3
parent9b3cf7b8bdd96df4e9d34c661fc78f4f552a2dd6
parent760a440bb41fcf153c0c0a80aab6e0b71fab03b7
Merge branch 'master' into deb-src-3.0-sqla

* master:
  Use session.commit_or_flush in some more functions.
  Attach commit_or_flush to session object to call either .commit() or .flush()
  Add doc for session_wrapper.
  process-new: Fix BCC and X-Katie handling
  Fix various small bugs
  Re-enable BXA notifications
  queue: Fix typo
  Convert process_new to new APIs
  Print a warning if a trainee tries to do something he's not allowed to do
  Documentation fixes

Conflicts:
daklib/queue.py
daklib/dbconn.py
daklib/queue.py