lp:~mnordhoff/loggerhead/jam-integration

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~jameinel/loggerhead/integration

John A Meinel: Pending requested 2010-05-15

Diff: 4126 lines (+2901/-709)

29 files modified

NEWS (+12/-0)
__init__.py (+26/-5)
docs/index.rst (+0/-2)
docs/start-loggerhead.rst (+0/-46)
docs/stop-loggerhead.rst (+0/-18)
loggerhead/apps/__init__.py (+3/-1)
loggerhead/apps/branch.py (+23/-37)
loggerhead/apps/config.py (+2/-2)
loggerhead/apps/transport.py (+4/-7)
loggerhead/changecache.py (+0/-43)
loggerhead/config.py (+1/-1)
loggerhead/controllers/download_ui.py (+2/-2)
loggerhead/history.py (+61/-118)
loggerhead/history_db.py (+1621/-0)
loggerhead/history_db_schema.py (+247/-0)
loggerhead/main.py (+8/-0)
loggerhead/templates/atom.pt (+3/-3)
loggerhead/tests/__init__.py (+27/-0)
loggerhead/tests/test_importer.py (+847/-0)
loggerhead/tests/test_simple.py (+9/-2)
loggerhead/trace.py (+0/-75)
loggerhead/wholehistory.py (+0/-85)
loggerhead/zptsupport.py (+0/-4)
serve-branches (+3/-0)
setup.py (+2/-4)
start-loggerhead (+0/-146)
start-loggerhead.1 (+0/-38)
stop-loggerhead (+0/-51)
stop-loggerhead.1 (+0/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

422. By Matt Nordhoff on 2010-05-15

Merge the latest history-db, fixing conflicts.

421. By John A Meinel on 2010-05-04

Merge the latest history-db fixes.

420. By John A Meinel on 2010-05-04

Bring in the typo fix

419. By John A Meinel on 2010-05-04

Bring in the recent history-db fixes.

418. By John A Meinel on 2010-05-03

Bring in the updated history-db changes.

417. By John A Meinel on 2010-04-30

Merge in the history_db changes, resolve a couple conflicts.

416. By John A Meinel on 2010-04-26

tag_cache

415. By John A Meinel on 2010-04-26

simple_mainline

414. By John A Meinel on 2010-04-26

page_loading

413. By John A Meinel on 2010-04-26

Bring in configurable-logging