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

Conflicts: airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00 · 2014-11-12 15:08:35 -05:00 · 97b74a0997
commit 97b74a0997
parent 10db978a2b f1fa4929ae
7 changed files with 42 additions and 25 deletions
--- a/python_apps/airtime_analyzer/setup.py
+++ b/python_apps/airtime_analyzer/setup.py
@ -30,6 +30,11 @@ setup(name='airtime_analyzer',
          'python-daemon',
          'requests',
          'apache-libcloud',
+          # These next 3 are required for requests to support SSL with SNI. Learned this the hard way...
+          # What sucks is that GCC is required to pip install these. 
+          #'ndg-httpsclient',
+          #'pyasn1',
+          #'pyopenssl'
      ],
      zip_safe=False,
      data_files=data_files)