← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

Viewing all changes in revision 411.2.9.

Committer: John Arbash Meinel
Date: 2011-03-16 11:40:05 UTC
mfrom: (434 trunk-rich)
mto: This revision was merged to the branch mainline in revision 435.
Revision ID: john@arbash-meinel.com-20110316114005-1rdrmdu9hda30xak

Merge trunk to resolve text conflict in deleting setup_logging

files added:
HACKING

info.py

load_test_scripts

load_test_scripts/multiple_instances.script

load_test_scripts/simple.script

loggerhead/controllers/annotate_ui.py

loggerhead/load_test.py

loggerhead/static/images/favicon.png

loggerhead/tests/test_load_test.py

files removed:
docs/start-loggerhead.rst

docs/stop-loggerhead.rst

loggerhead.conf.example

loggerhead/apps/config.py

loggerhead/templates/browse.pt

loggerhead/trace.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

files renamed:
loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py

loggerhead/static/css/annotate.css => loggerhead/static/css/view.css

loggerhead/templates/annotate.pt => loggerhead/templates/view.pt

files modified:
.bzrignore

MANIFEST.in

Makefile

NEWS

__init__.py

docs/index.rst

loggerhead/__init__.py

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/transport.py

loggerhead/controllers/__init__.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/highlight.py

loggerhead/history.py

loggerhead/static/css/diff.css

loggerhead/static/css/files.css

loggerhead/static/css/global.css

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/templatefunctions.py

loggerhead/templates/atom.pt

loggerhead/templates/changelog.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisioninfo.pt

loggerhead/tests/__init__.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_simple.py

setup.py

Show diffs side-by-side

added added

removed removed

docs/start-loggerhead.rst

docs/stop-loggerhead.rst

load_test_scripts/

load_test_scripts/multiple_instances.script

load_test_scripts/simple.script

loggerhead.conf.example

loggerhead/__init__.py

loggerhead/apps/__init__.py

loggerhead/apps/branch.py

loggerhead/apps/config.py

loggerhead/apps/transport.py

loggerhead/controllers/__init__.py

loggerhead/controllers/annotate_ui.py

loggerhead/controllers/changelog_ui.py

loggerhead/controllers/download_ui.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/revision_ui.py

loggerhead/controllers/view_ui.py

loggerhead/highlight.py

loggerhead/history.py

loggerhead/load_test.py

loggerhead/static/css/diff.css

loggerhead/static/css/files.css

loggerhead/static/css/global.css

loggerhead/static/css/view.css

loggerhead/static/images/bg_Tabs.gif

loggerhead/static/images/bg_menuTabs.gif

loggerhead/static/images/bg_submenuTabs.gif

loggerhead/static/images/favicon.png

loggerhead/templatefunctions.py

loggerhead/templates/atom.pt

loggerhead/templates/browse.pt

loggerhead/templates/changelog.pt

loggerhead/templates/directory.pt

loggerhead/templates/inventory.pt

loggerhead/templates/macros.pt

loggerhead/templates/revision.pt

loggerhead/templates/revisioninfo.pt

loggerhead/templates/view.pt

loggerhead/tests/__init__.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_load_test.py

loggerhead/tests/test_simple.py

loggerhead/trace.py

start-loggerhead

start-loggerhead.1

stop-loggerhead

stop-loggerhead.1

Older »