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/bd08dcc5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/bd08dcc5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/bd08dcc5 Branch: refs/heads/v1-8-test Commit: bd08dcc54d7b8791eef8956baf58e4163d9666ee Parents: 5782ad4 89f0ca4 Author: Bolke de Bruin <bo...@xs4all.nl> Authored: Mon Jan 16 17:40:07 2017 +0100 Committer: Bolke de Bruin <bo...@xs4all.nl> Committed: Mon Jan 16 17:40:07 2017 +0100 ---------------------------------------------------------------------- airflow/contrib/sensors/hdfs_sensors.py | 1 + airflow/models.py | 46 ++++++++++++++++------------ airflow/ti_deps/deps/prev_dagrun_dep.py | 4 +-- airflow/www/views.py | 2 +- tests/core.py | 8 ++--- 5 files changed, 34 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
