You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by cr...@apache.org on 2017/09/13 16:50:34 UTC

[20/36] incubator-airflow git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow

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/96602935
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/96602935
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/96602935

Branch: refs/heads/v1-9-test
Commit: 966029357be5bcad2826cadb7333c1da9a619394
Parents: 5ff7e83 0d0cc62
Author: Chris Riccomini <cr...@apache.org>
Authored: Mon Aug 14 11:25:50 2017 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Mon Aug 14 11:25:50 2017 -0700

----------------------------------------------------------------------
 README.md                                       |  12 +-
 UPDATING.md                                     |  29 +--
 airflow/bin/cli.py                              | 106 ++-------
 airflow/config_templates/__init__.py            |  13 ++
 airflow/config_templates/default_airflow.cfg    |   7 +
 .../config_templates/default_airflow_logging.py |  94 ++++++++
 airflow/dag/__init__.py                         |   1 -
 ...dc7_add_max_tries_column_to_task_instance.py |   9 +-
 airflow/models.py                               |   9 +-
 airflow/settings.py                             |  14 ++
 airflow/task_runner/base_task_runner.py         |   2 +
 airflow/utils/log/__init__.py                   |  13 ++
 airflow/utils/log/file_task_handler.py          | 176 ++++++++++++++
 airflow/utils/log/gcs_task_handler.py           |  95 ++++++++
 airflow/utils/log/s3_task_handler.py            |  91 ++++++++
 airflow/utils/logging.py                        |  87 +++----
 airflow/www/views.py                            | 230 +++++++------------
 docs/configuration.rst                          |  15 +-
 tests/utils/test_log_handlers.py                |  73 ++++++
 tests/utils/test_logging.py                     |  96 +++++++-
 tests/www/test_views.py                         |  58 +++++
 21 files changed, 896 insertions(+), 334 deletions(-)
----------------------------------------------------------------------