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/5782ad4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/5782ad4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/5782ad4b Branch: refs/heads/v1-8-test Commit: 5782ad4b6910c5bf719a9bb62e696819f1ffb196 Parents: 00e34bd 4a5e17b Author: Bolke de Bruin <[email protected]> Authored: Fri Jan 13 21:22:04 2017 +0100 Committer: Bolke de Bruin <[email protected]> Committed: Fri Jan 13 21:22:04 2017 +0100 ---------------------------------------------------------------------- README.md | 3 + airflow/configuration.py | 10 ++ airflow/jobs.py | 34 +++++- airflow/models.py | 65 +++++++++-- airflow/ti_deps/dep_context.py | 4 + airflow/ti_deps/deps/not_in_retry_period_dep.py | 6 + airflow/ti_deps/deps/prev_dagrun_dep.py | 20 +++- docs/scheduler.rst | 52 +++++++++ tests/jobs.py | 112 ++++++++++++++++++- 9 files changed, 290 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
