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

Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
	python_apps/airtime_analyzer/setup.py
This commit is contained in:
drigato 2014-12-12 09:36:27 -05:00
commit 29d3d877ab
19 changed files with 333 additions and 364 deletions

View file

@ -28,8 +28,9 @@ setup(name='airtime_analyzer',
'coverage',
'mock',
'python-daemon',
'requests',
'requests'
'apache-libcloud',
'rgain',
# 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',