Merged baseUrl related conflicts

2012-10-29 11:56:20 -04:00 · 2012-10-29 11:56:20 -04:00 · dc00528cd5
commit dc00528cd5
parent 3a7700eaac bf5bc3a116
62 changed files with 1155 additions and 1234 deletions
--- a/python_apps/media-monitor2/mm2.py
+++ b/python_apps/media-monitor2/mm2.py
@ -60,7 +60,8 @@ def main(global_config, api_client_config, log_config,
            try:
                with open(config['index_path'], 'w') as f: f.write(" ")
            except Exception as e:
-                log.info("Failed to create index file with exception: %s" % str(e))
+                log.info("Failed to create index file with exception: %s" \
+                         % str(e))
            else:
                log.info("Created index file, reloading configuration:")
                main( global_config,  api_client_config, log_config,