You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/01/11 07:26:24 UTC
[2/2] incubator-airflow git commit: Merge branch 'master' into
v1-8-test
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/58e118cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/58e118cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/58e118cc
Branch: refs/heads/v1-8-test
Commit: 58e118ccd21e2ab1b3e8bb2357fc1c2a44370e70
Parents: 2d0361a e0f5c0c
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Wed Jan 11 08:25:39 2017 +0100
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Wed Jan 11 08:25:39 2017 +0100
----------------------------------------------------------------------
airflow/api/client/api_client.py | 2 +-
airflow/api/client/json_client.py | 3 +-
airflow/api/client/local_client.py | 7 ++--
airflow/api/common/experimental/trigger_dag.py | 5 +--
airflow/bin/cli.py | 8 +++--
airflow/models.py | 18 ++++++++++
airflow/www/api/experimental/endpoints.py | 32 ++++++++++++++---
tests/www/api/experimental/test_endpoints.py | 38 +++++++++++++++++++++
8 files changed, 101 insertions(+), 12 deletions(-)
----------------------------------------------------------------------