Rev 420: Merge trunk to resolve text conflict in deleting setup_logging in http://bazaar.launchpad.net/~jameinel/loggerhead/configurable_logging

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/loggerhead/configurable_logging

------------------------------------------------------------
revno: 420 [merge]
revision-id: john at arbash-meinel.com-20110316114005-1rdrmdu9hda30xak
parent: john at arbash-meinel.com-20110316113927-t2e1h8n1tsal9zpi
parent: john at arbash-meinel.com-20110315102440-n4zr988738z125cd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: configurable_logging
timestamp: Wed 2011-03-16 12:40:05 +0100
message:
  Merge trunk to resolve text conflict in deleting setup_logging
removed:
  docs/start-loggerhead.rst      startloggerhead.rst-20100323154424-dicj9xm6u3vf41sh-2
  docs/stop-loggerhead.rst       stoploggerhead.rst-20100323154424-dicj9xm6u3vf41sh-3
  loggerhead.conf.example        loggerhead.conf-20061215091925-m5t3bxgioe500tx9-1
  loggerhead/apps/config.py      config.py-20080618033248-et3sshjkyrhc8lae-1
  loggerhead/templates/browse.pt browse.pt-20070829133152-cxmialrmbosh0e69-1
  loggerhead/trace.py            logging.py-20080822155946-g8y1qrx5w10f73j1-1
  start-loggerhead               startloggerhead.py-20061211064337-5lpgd5knbgm7jrgz-6
  start-loggerhead.1             startloggerhead.1-20080726140951-h8fmjbau0llsvyj8-1
  stop-loggerhead                stoploggerhead.py-20070114053853-ns12sv3i44ir6350-1
  stop-loggerhead.1              stoploggerhead.1-20080726140951-h8fmjbau0llsvyj8-2
added:
  HACKING                        hacking-20110210230514-0nni6rcgjisxbyj6-1
  info.py                        info.py-20101010002936-6abrfcpy5e98uewa-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/controllers/annotate_ui.py annotate_ui.py-20101130101535-elf3r4k8smkr5h0g-1
  loggerhead/load_test.py        load_test.py-20110209211518-hww0u9oztvmw5jfh-1
  loggerhead/static/images/favicon.png favicon.png-20110217195019-e1fz7adzx69pumn3-1
  loggerhead/tests/test_load_test.py test_load_test.py-20110209211518-hww0u9oztvmw5jfh-2
renamed:
  loggerhead/controllers/annotate_ui.py => loggerhead/controllers/view_ui.py annotate_ui.py-20061213025409-n0tuh5u7v7kwnmd5-1
  loggerhead/static/css/annotate.css => loggerhead/static/css/view.css annotate.css-20080623191119-ipj1kg0ct3v17u4k-1
  loggerhead/templates/annotate.pt => loggerhead/templates/view.pt annotate.pt-20070704145132-9gbz2i4q7bg78zsz-1
modified:
  .bzrignore                     bzrignore-20061224064209-1idfnfdl6dow0zz5-1
  MANIFEST.in                    manifest.in-20061224064204-olufa1zdngeefbi1-1
  Makefile                       makefile-20061224064204-olufa1zdngeefbi1-2
  NEWS                           news-20070121024650-6cwmhprgtcegpxvm-1
  __init__.py                    __init__.py-20090123174919-ekabddqbmvwuci2i-1
  docs/index.rst                 index.rst-20100323145051-edinunduiyd7e4da-6
  loggerhead/__init__.py         __init__.py-20061211064342-102iqirsciyvgtcf-2
  loggerhead/apps/__init__.py    __init__.py-20080618010557-l75daamahmjxto53-2
  loggerhead/apps/branch.py      wsgiapp.py-20080612051902-5y0zpdi6fhxgun6z-2
  loggerhead/apps/transport.py   wsgitest.py-20080612051902-5y0zpdi6fhxgun6z-1
  loggerhead/controllers/__init__.py __init__.py-20061211064342-102iqirsciyvgtcf-17
  loggerhead/controllers/changelog_ui.py changelog_ui.py-20061211064342-102iqirsciyvgtcf-19
  loggerhead/controllers/download_ui.py download_ui.py-20061218200501-npdjpxhokgv05sfq-1
  loggerhead/controllers/inventory_ui.py inventory_ui.py-20061212203332-s4vehyfs3tn6zm31-1
  loggerhead/controllers/revision_ui.py revision_ui.py-20061211192234-f9wby6myjko7z7f0-1
  loggerhead/highlight.py        highlight.py-20090226141055-zxa400zwami6vmkr-1
  loggerhead/history.py          history.py-20061211064342-102iqirsciyvgtcf-5
  loggerhead/static/css/diff.css diff.css-20080619163108-6x2eojed329duh6y-1
  loggerhead/static/css/files.css files.css-20080620190456-jbo0imesx6tfj5ym-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/templatefunctions.py templatefunctions.py-20070904153009-610ek2z3tgvp0ce7-1
  loggerhead/templates/atom.pt   atom.pt-20070829094002-0wwnn7r8ph7tf6ay-1
  loggerhead/templates/changelog.pt changelog.pt-20070718124519-1k4a6w501czrp75b-1
  loggerhead/templates/directory.pt directory.pt-20080801050617-itpytpliz14l423w-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/templates/revisioninfo.pt revisioninfo.pt-20070820180133-tx2jlsutm12tql2b-2
  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
  setup.py                       setup.py-20061211064337-5lpgd5knbgm7jrgz-5
  loggerhead/controllers/view_ui.py annotate_ui.py-20061213025409-n0tuh5u7v7kwnmd5-1
  loggerhead/static/css/view.css annotate.css-20080623191119-ipj1kg0ct3v17u4k-1
  loggerhead/templates/view.pt   annotate.pt-20070704145132-9gbz2i4q7bg78zsz-1
-------------- next part --------------

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