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 2016/08/09 13:10:02 UTC
[2/2] incubator-airflow git commit: Merge remote-tracking branch
'apache/master'
Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/2c3d0fdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2c3d0fdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2c3d0fdb
Branch: refs/heads/master
Commit: 2c3d0fdbe984241a6a5ed126b7edb5f148998047
Parents: 1d67d62 9d254a3
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Tue Aug 9 15:09:51 2016 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Tue Aug 9 15:09:51 2016 +0200
----------------------------------------------------------------------
airflow/bin/cli.py | 157 ++++++++++++++++++++++++++++++++----
airflow/configuration.py | 12 ++-
airflow/models.py | 2 +-
airflow/settings.py | 5 ++
airflow/www/app.py | 3 +
airflow/www/gunicorn_config.py | 23 ++++++
dags/test_dag.py | 37 +++++++++
dags/testdruid.py | 33 --------
scripts/ci/requirements.txt | 1 +
9 files changed, 223 insertions(+), 50 deletions(-)
----------------------------------------------------------------------