lp:~jameinel/loggerhead/trunk-into-experimental

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~loggerhead-team/loggerhead/experimental at revision 450

Michael Hudson-Doyle: Approve on 2011-02-10

Diff: 1124 lines (+781/-79)

17 files modified

HACKING (+59/-0)
NEWS (+15/-2)
__init__.py (+24/-49)
load_test_scripts/multiple_instances.script (+19/-0)
load_test_scripts/simple.script (+9/-0)
loggerhead/controllers/__init__.py (+6/-3)
loggerhead/controllers/raw_ui.py (+8/-5)
loggerhead/controllers/view_ui.py (+3/-3)
loggerhead/load_test.py (+233/-0)
loggerhead/static/css/global.css (+5/-5)
loggerhead/templates/inventory.pt (+7/-0)
loggerhead/templates/macros.pt (+0/-8)
loggerhead/templates/revision.pt (+0/-1)
loggerhead/tests/__init__.py (+1/-0)
loggerhead/tests/test_controllers.py (+43/-1)
loggerhead/tests/test_load_test.py (+337/-0)
loggerhead/tests/test_simple.py (+12/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

452. By John A Meinel on 2011-02-10

Bring in the load-test updates as well.

451. By John A Meinel on 2011-02-10

Fix a failing test.

Pygments was interacting oddly with a cgi escape-for-annotate test.

450. By John A Meinel on 2011-02-10

An attempt at merging loggerhead trunk into the experimental branch.

The only controversial piece here is probably reverting the inventory
template to linking to View and Download rather than Raw and Download.

449. By John A Meinel on 2011-02-09

Re-merge bugfix for #686324 which was lost in the branch shuffle.

448. By John A Meinel on 2011-02-09

Land the history-db updates to get the test suite passing again.

447. By John A Meinel on 2011-01-27

Merge in the incremental import code.

446. By John A Meinel on 2011-01-27

Make loggerhead compatible with bzr.dev 2.4 series

445. By Max Kanat-Alexander on 2011-01-20

Update to YUI 3.0.0.

444. By Max Kanat-Alexander on 2011-01-20

When somebody asks for a revision that doesn't exist, just return a 404
instead of a traceback.

443. By Max Kanat-Alexander on 2011-01-11

Make /download URLs have an identical format to /raw URLs.