Merge branch 'saas' into saas-dev

python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py

@@ -9,6 +9,8 @@ import pickle
 import threading 
 from urlparse import urlparse
 
+requests.packages.urllib3.disable_warnings()
+
 class PicklableHttpRequest:
     def __init__(self, method, url, data, api_key):
         self.method = method

python_apps/airtime_analyzer/setup.py

@@ -23,12 +23,13 @@ setup(name='airtime_analyzer',
       install_requires=[
           'mutagen',
           'pika',
+          'daemon',
           'python-magic',
           'nose',
           'coverage',
           'mock',
           'python-daemon==1.6',
-          'requests',
+          'requests>=2.7.0',
           'apache-libcloud',
           'rgain',
           'boto',