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/05/13 10:51:08 UTC

[3/3] incubator-airflow git commit: Merge pull request #2289 from vfoucault/feature/AIRFLOW-1182_1184

Merge pull request #2289 from vfoucault/feature/AIRFLOW-1182_1184


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/aaf308a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/aaf308a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/aaf308a2

Branch: refs/heads/master
Commit: aaf308a29c26d147a75cf95b16e95f6dd91031de
Parents: 93666f9 b113432
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Sat May 13 12:50:56 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Sat May 13 12:50:56 2017 +0200

----------------------------------------------------------------------
 airflow/contrib/hooks/spark_submit_hook.py      |  13 +-
 .../contrib/operators/spark_submit_operator.py  |   3 +
 airflow/settings.py                             |   3 +-
 tests/contrib/hooks/test_spark_submit_hook.py   | 222 +++++++++++--------
 .../operators/test_spark_submit_operator.py     |  90 ++++++--
 5 files changed, 207 insertions(+), 124 deletions(-)
----------------------------------------------------------------------