← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

~loggerhead-team/loggerhead/trunk-rich

Viewing all changes in revision 432.2.6.

Committer: John Arbash Meinel
Date: 2011-03-16 12:24:06 UTC
mfrom: (436 trunk-rich)
mto: This revision was merged to the branch mainline in revision 438.
Revision ID: john@arbash-meinel.com-20110316122406-xdv5771vlih6s76q

Merge trunk and resolve NEWS conflict.

files modified:
Makefile

NEWS

__init__.py

loggerhead/apps/transport.py

loggerhead/config.py

loggerhead/controllers/__init__.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/view_ui.py

loggerhead/main.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_simple.py

loggerhead/wholehistory.py

loggerhead/zptsupport.py

Show diffs side-by-side

added added

removed removed

loggerhead/apps/transport.py

loggerhead/config.py

loggerhead/controllers/__init__.py

loggerhead/controllers/inventory_ui.py

loggerhead/controllers/view_ui.py

loggerhead/main.py

loggerhead/tests/test_controllers.py

loggerhead/tests/test_simple.py

loggerhead/wholehistory.py

loggerhead/zptsupport.py

Older »