Merge branch 'master' into move_tests_dependencies

.travis.yml

@@ -1,6 +1,8 @@
 language: python
 python:
   - '2.7.11'
+  - '2.7.12'
+  - '2.7.13'
 before_install:
   - ES_VERSION=2.4.4; curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.deb && sudo dpkg -i --force-confnew elasticsearch-${ES_VERSION}.deb && sudo service elasticsearch restart
   - sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime

cron/healthAndStatus-fxa.py

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# Copyright (c) 2014 Mozilla Corporation
-#
-# Contributors:
-# Jeff Bryner jbryner@mozilla.com
-
-source  /opt/mozdef/envs/mozdef/bin/activate
-/opt/mozdef/envs/mozdef/cron/healthAndStatus.py -c /opt/mozdef/envs/mozdef/cron/healthAndStatus.fxaprod.conf

cron/healthAndStatus-fxa.sh

@@ -9,4 +9,4 @@
 # Brandon Myers bmyers@mozilla.com
 
 source  /opt/mozdef/envs/mozdef/bin/activate
-/opt/mozdef/envs/mozdef/cron/healthAndStatus-fxa.py -c /opt/mozdef/envs/mozdef/cron/healthAndStatus.fxa.conf
+/opt/mozdef/envs/mozdef/cron/healthAndStatus.py -c /opt/mozdef/envs/mozdef/cron/healthAndStatus.fxa.conf