Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage

Conflicts: airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00 · 2015-01-22 15:48:34 -05:00 · 134ade877c
commit 134ade877c
parent bade613e80 6ebe8ec6c8
49 changed files with 739 additions and 548 deletions
--- a/python_apps/airtime_analyzer/setup.py
+++ b/python_apps/airtime_analyzer/setup.py
@ -27,7 +27,7 @@ setup(name='airtime_analyzer',
          'nose',
          'coverage',
          'mock',
-          'python-daemon',
+          'python-daemon==1.6',
          'requests',
          'apache-libcloud',
          'rgain',