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/07/14 18:08:37 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/aea1fa2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/aea1fa2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/aea1fa2d

Branch: refs/heads/master
Commit: aea1fa2d653c5dde236cc82022cf0db0cde59856
Parents: 3079da0 c32452a
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Thu Jul 14 20:07:58 2016 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Thu Jul 14 20:07:58 2016 +0200

----------------------------------------------------------------------
 README.md                                       |   1 +
 airflow/bin/cli.py                              |   1 +
 airflow/configuration.py                        |   1 +
 .../auth/backends/github_enterprise_auth.py     |   1 +
 airflow/contrib/auth/backends/ldap_auth.py      |   1 +
 airflow/contrib/auth/backends/password_auth.py  |   1 +
 airflow/contrib/hooks/datastore_hook.py         |   1 +
 airflow/contrib/hooks/qubole_hook.py            |   1 +
 airflow/contrib/hooks/spark_sql_hook.py         | 149 +++++++++++++++++++
 airflow/contrib/hooks/vertica_hook.py           |   1 +
 airflow/contrib/operators/bigquery_operator.py  |   1 +
 .../contrib/operators/bigquery_to_bigquery.py   |   1 +
 airflow/contrib/operators/bigquery_to_gcs.py    |   1 +
 airflow/contrib/operators/fs_operator.py        |   1 +
 .../contrib/operators/gcs_download_operator.py  |   1 +
 airflow/contrib/operators/gcs_to_bq.py          |   1 +
 airflow/contrib/operators/mysql_to_gcs.py       |   1 +
 airflow/contrib/operators/spark_sql_operator.py |  91 +++++++++++
 airflow/contrib/operators/vertica_to_hive.py    |   1 +
 .../example_branch_python_dop_operator_3.py     |   1 +
 .../example_passing_params_via_test_command.py  |   1 +
 airflow/example_dags/example_xcom.py            |   3 +
 airflow/exceptions.py                           |  11 +-
 airflow/hooks/__init__.py                       |   1 +
 airflow/hooks/druid_hook.py                     |   1 +
 airflow/hooks/mysql_hook.py                     |   1 +
 .../versions/13eb55f81627_for_compatibility.py  |   4 +-
 .../versions/211e584da130_add_ti_state_index.py |   1 +
 ...e90f54d61_more_logging_into_task_isntance.py |   1 +
 .../versions/4446e08588_dagrun_start_end.py     |   1 +
 airflow/operators/__init__.py                   |   1 +
 airflow/operators/hive_to_mysql.py              |   1 +
 airflow/plugins_manager.py                      |   3 +
 airflow/security/kerberos.py                    |   1 +
 airflow/security/utils.py                       |   1 +
 airflow/utils/helpers.py                        |   1 +
 airflow/utils/logging.py                        |   2 +-
 airflow/www/app.py                              |   2 +
 airflow/www/utils.py                            |   1 +
 airflow/www/views.py                            |   1 +
 40 files changed, 288 insertions(+), 9 deletions(-)
----------------------------------------------------------------------