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/fcf31d88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/fcf31d88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/fcf31d88 Branch: refs/heads/v1-9-test Commit: fcf31d8813b66f09fc6725959bfa0cdad9efc847 Parents: ccf3ccc ddc5026 Author: Chris Riccomini <criccom...@apache.org> Authored: Mon Aug 7 09:24:34 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Mon Aug 7 09:24:34 2017 -0700 ---------------------------------------------------------------------- airflow/bin/cli.py | 51 +++++++-- airflow/jobs.py | 144 +++++++++++++++---------- airflow/models.py | 119 ++++++++++++++++++-- airflow/www/api/experimental/endpoints.py | 2 +- airflow/www/views.py | 17 ++- tests/core.py | 10 ++ tests/jobs.py | 140 +++++++++++++++++++++--- tests/models.py | 63 +++++++++++ tests/www/test_views.py | 62 +++++++++++ 9 files changed, 511 insertions(+), 97 deletions(-) ----------------------------------------------------------------------
