Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00:00 · 2014-10-10 19:57:22 +00:00 · 9fb35c448e
commit 9fb35c448e
parent 0196aa21f5 081ca0a6a4
24 changed files with 165 additions and 106 deletions
--- a/python_apps/airtime_analyzer/install/upstart/airtime_analyzer.conf
+++ b/python_apps/airtime_analyzer/install/upstart/airtime_analyzer.conf
@ -9,14 +9,16 @@ respawn
 setuid www-data
 setgid www-data

-expect fork
+#expect fork

 env LANG='en_US.UTF-8'
 env LC_ALL='en_US.UTF-8'

-script
-    airtime_analyzer
-end script
+#script
+#    airtime_analyzer
+#end script
+
+exec airtime_analyzer