Merge branch 'fix_localtaskjob'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/5479ac8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/5479ac8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/5479ac8d Branch: refs/heads/master Commit: 5479ac8d4ab9bbb4bab839df9f0d5cf0c0e80388 Parents: 4edf913 24d641b Author: Bolke de Bruin <[email protected]> Authored: Wed Jan 25 21:36:28 2017 +0100 Committer: Bolke de Bruin <[email protected]> Committed: Wed Jan 25 21:36:28 2017 +0100 ---------------------------------------------------------------------- airflow/jobs.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/5479ac8d/airflow/jobs.py ----------------------------------------------------------------------
