Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/3c7ad18d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/3c7ad18d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/3c7ad18d Branch: refs/heads/v1-9-test Commit: 3c7ad18d01f4b8a4a0eddb5944707efb2351240b Parents: 0a2902c 42cad60 Author: Chris Riccomini <criccom...@apache.org> Authored: Tue Aug 15 10:21:48 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Tue Aug 15 10:21:48 2017 -0700 ---------------------------------------------------------------------- airflow/task_runner/base_task_runner.py | 1 + airflow/www/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------