lp:~jelmer/loggerhead/only-simplejson

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:loggerhead at revision 430

John A Meinel: Approve on 2011-03-02

Diff: 80 lines (+8/-18)

5 files modified

NEWS (+3/-0)
loggerhead/controllers/changelog_ui.py (+1/-4)
loggerhead/controllers/revision_ui.py (+1/-4)
loggerhead/load_test.py (+1/-4)
loggerhead/templatefunctions.py (+2/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #586611: loggerhead needs a hard dependency on simplejson

Medium

Fix Released

Link a bug report

Related blueprints

430. By Jelmer Vernooij on 2011-03-02

Drop support for json as simplejson alternative.

429. By John A Meinel on 2011-03-02

Merge Huw Wilkin's CSS rework to make Loggerhead look more like Launchpad.

428. By Jelmer Vernooij on 2011-02-12

Merge support for bzrlib instances without bzrlib.util.configobj.

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

Fix the annotate test to handle when pygments is installed.

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

Land the load-test code into trunk.

425. By Jelmer Vernooij on 2011-02-10

Merge dropping of workarounds for pre-1.16 versions of Bazaar.

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

Merge the "don't run template on HEAD requests" branch.

This should stop us from getting OOPS during HEAD requests from haproxy
(bug #701329). It also should mean that at least most HEAD requests stop
returning body content (bug #716201), and that we perform less total work
to return HEAD info (bug #716217).

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

Merge the PQM tip into trunk, fixing tests and updating the menus a bit.

422. By Max Kanat-Alexander on 2010-11-12

loggerhead.trace was missing an import of logging.handlers, which caused
start-loggerhead to die if a log.roll config setting was set.

421. By Max Kanat-Alexander on 2010-11-11

Release 1.18