Merge branch 'master' into v1-8-test
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a46f114a Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a46f114a Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a46f114a Branch: refs/heads/v1-8-test Commit: a46f114a5ea8f24dac1317204098153e8e930efa Parents: df9464b 3ac2fba Author: Bolke de Bruin <bo...@xs4all.nl> Authored: Mon Jan 16 22:24:20 2017 +0100 Committer: Bolke de Bruin <bo...@xs4all.nl> Committed: Mon Jan 16 22:24:20 2017 +0100 ---------------------------------------------------------------------- airflow/configuration.py | 2 +- scripts/systemd/airflow-flower.service | 3 +-- scripts/systemd/airflow-kerberos.service | 3 +-- scripts/systemd/airflow-scheduler.service | 1 - scripts/systemd/airflow-webserver.service | 7 ++----- scripts/systemd/airflow-worker.service | 2 +- 6 files changed, 6 insertions(+), 12 deletions(-) ----------------------------------------------------------------------