Merge branch 'AIRFLOW-747'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/4a5e17b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/4a5e17b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/4a5e17b3 Branch: refs/heads/v1-8-test Commit: 4a5e17b37d570617ade882250880c7c2cdbf5e83 Parents: c7e10cb 68f484c Author: Bolke de Bruin <[email protected]> Authored: Fri Jan 13 21:11:38 2017 +0100 Committer: Bolke de Bruin <[email protected]> Committed: Fri Jan 13 21:11:38 2017 +0100 ---------------------------------------------------------------------- airflow/jobs.py | 11 +++++++++-- airflow/models.py | 10 ++++++++-- airflow/ti_deps/dep_context.py | 4 ++++ airflow/ti_deps/deps/not_in_retry_period_dep.py | 6 ++++++ tests/jobs.py | 10 ++++++++-- 5 files changed, 35 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4a5e17b3/airflow/jobs.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4a5e17b3/airflow/models.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4a5e17b3/tests/jobs.py ----------------------------------------------------------------------
