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/1ea4c533 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/1ea4c533 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/1ea4c533 Branch: refs/heads/v1-8-test Commit: 1ea4c533f7ba56709ecf89812759e4b84c049382 Parents: ecbe3ce a2b0ea3 Author: Bolke de Bruin <[email protected]> Authored: Sun Jan 22 17:38:27 2017 +0100 Committer: Bolke de Bruin <[email protected]> Committed: Sun Jan 22 17:38:27 2017 +0100 ---------------------------------------------------------------------- airflow/jobs.py | 8 +------- airflow/task_runner/__init__.py | 2 +- setup.py | 6 +++--- 3 files changed, 5 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
