lp:~bigkevmcd/offspring/fix-bug-914743

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:offspring at revision 121

CE Infrastructure: Pending requested 2012-01-24

Offspring Committers: Pending requested 2012-01-16

Diff: 380 lines (+86/-55)

9 files modified

lib/offspring/master/tests/helpers.py (+1/-1)
lib/offspring/web/queuemanager/models.py (+23/-11)
lib/offspring/web/queuemanager/tests/factory.py (+4/-2)
lib/offspring/web/queuemanager/tests/helpers.py (+4/-3)
lib/offspring/web/queuemanager/tests/test_managers.py (+5/-6)
lib/offspring/web/queuemanager/tests/test_metrics.py (+4/-7)
lib/offspring/web/queuemanager/tests/test_models.py (+42/-22)
lib/offspring/web/settings_devel.py (+1/-1)
setup_test_database.sh (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #914743: Lexbuilder.average_load executes SQL that's not supported by sqlite3

Undecided

Fix Released

Link a bug report

Related blueprints

183. By Kevin McDermott on 2012-01-20

Merge trunk.

182. By Kevin McDermott on 2012-01-16

Merge forward and fix conflicts.

181. By Kevin McDermott on 2012-01-16

Last PEP8 issue.

180. By Kevin McDermott on 2012-01-13

Tidy up PEP8 & lint.

179. By Kevin McDermott on 2012-01-13

Reimplementation of average_load using Django.

178. By Kevin McDermott on 2012-01-13

Add tests for Lexbuilder.average_load.

177. By Kevin McDermott on 2012-01-12

Merge forward.

176. By Kevin McDermott on 2011-12-16

Ensure we're merged up to date.

175. By Kevin McDermott on 2011-12-16

Merge forward from trunk.

174. By Kevin McDermott on 2011-12-15

Return ASAP if the current elapsed build time is greater than the average.