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 17:40:13 UTC

[29/37] 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/2c95456c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2c95456c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2c95456c

Branch: refs/heads/master
Commit: 2c95456c8f8da9b8e0f6ea27fd254780d26f458a
Parents: b1e355c 4c674cc
Author: Chris Riccomini <cr...@apache.org>
Authored: Wed Sep 6 09:45:42 2017 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Wed Sep 6 09:45:42 2017 -0700

----------------------------------------------------------------------
 .../config_templates/default_airflow_logging.py |  2 +-
 airflow/contrib/hooks/bigquery_hook.py          |  6 +-
 airflow/contrib/hooks/spark_sql_hook.py         | 33 ++++-----
 airflow/contrib/operators/bigquery_operator.py  |  8 ++-
 airflow/contrib/operators/spark_sql_operator.py |  3 +
 airflow/utils/log/file_task_handler.py          | 25 +++++--
 airflow/utils/log/gcs_task_handler.py           |  8 +--
 airflow/utils/log/s3_task_handler.py            |  8 +--
 .../operators/test_spark_sql_operator.py        | 73 ++++++++++++++++++++
 tests/utils/test_log_handlers.py                | 23 ++++++
 10 files changed, 152 insertions(+), 37 deletions(-)
----------------------------------------------------------------------