Rev 450: Bring the latest trunk code into the experimental branch. in http://bazaar.launchpad.net/~loggerhead-team/loggerhead/experimental

[John Arbash Meinel]

At http://bazaar.launchpad.net/~loggerhead-team/loggerhead/experimental

------------------------------------------------------------
revno: 450 [merge]
revision-id: john at arbash-meinel.com-20110210235823-prk4nr8q52yvrd0y
parent: john at arbash-meinel.com-20110209221311-h6lwqhq0g6qyr08u
parent: john at arbash-meinel.com-20110210230900-7xuqstphs1efolvp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: experimental
timestamp: Thu 2011-02-10 17:58:23 -0600
message:
  Bring the latest trunk code into the experimental branch.
added:
  HACKING                        hacking-20110210230514-0nni6rcgjisxbyj6-1
  load_test_scripts/             load_test_scripts-20110210005009-joifj89nhdn34aix-1
  load_test_scripts/multiple_instances.script multiple_instances.s-20110210005705-laogm0i7xp7t2o0a-1
  load_test_scripts/simple.script load_test.script-20110210004226-8f1448651hqu0zn0-1
  loggerhead/load_test.py        load_test.py-20110209211518-hww0u9oztvmw5jfh-1
  loggerhead/tests/test_load_test.py test_load_test.py-20110209211518-hww0u9oztvmw5jfh-2
modified:
  NEWS                           news-20070121024650-6cwmhprgtcegpxvm-1
  __init__.py                    __init__.py-20090123174919-ekabddqbmvwuci2i-1
  loggerhead/controllers/__init__.py __init__.py-20061211064342-102iqirsciyvgtcf-17
  loggerhead/controllers/raw_ui.py raw_ui.py-20101203171103-q3wcwhyv18gtz7ot-1
  loggerhead/controllers/view_ui.py annotate_ui.py-20061213025409-n0tuh5u7v7kwnmd5-1
  loggerhead/static/css/global.css global.css-20080612210817-369c9b4pvkk8mme5-1
  loggerhead/static/images/bg_Tabs.gif bg_tabs.gif-20080612210817-369c9b4pvkk8mme5-2
  loggerhead/static/images/bg_menuTabs.gif bg_menutabs.gif-20080612210817-369c9b4pvkk8mme5-3
  loggerhead/static/images/bg_submenuTabs.gif bg_submenutabs.gif-20080619163443-b2vk9ji7hh9sc0y2-2
  loggerhead/templates/inventory.pt inventory.pt-20070820180133-tx2jlsutm12tql2b-1
  loggerhead/templates/macros.pt macros.pt-20070904160828-etginn0z4zyup9lz-1
  loggerhead/templates/revision.pt revision.pt-20070829113415-ewd2n5wkd4be6gb8-1
  loggerhead/tests/__init__.py   __init__.py-20061211064342-102iqirsciyvgtcf-29
  loggerhead/tests/test_controllers.py test_controllers.py-20090210051739-5d14nlvjvn2ep4x5-1
  loggerhead/tests/test_simple.py test_simple.py-20070523103003-hrxwg5n1hcebw7l6-1
-------------- next part --------------

Diff too large for email (1132 lines, the limit is 1000).