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/0809ee9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/0809ee9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/0809ee9d Branch: refs/heads/v1-9-test Commit: 0809ee9db93936827a4417b9d7e018d3321e8b45 Parents: 33eb501 f5ffb9d Author: Chris Riccomini <criccom...@apache.org> Authored: Wed Jul 12 10:08:37 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Wed Jul 12 10:08:37 2017 -0700 ---------------------------------------------------------------------- README.md | 2 + airflow/contrib/hooks/gcp_cloudml_hook.py | 82 ++++----- airflow/contrib/hooks/spark_submit_hook.py | 8 +- airflow/contrib/operators/cloudml_operator.py | 148 ++++++++++++++- airflow/hooks/hive_hooks.py | 29 ++- ...dc7_add_max_tries_column_to_task_instance.py | 106 +++++++++++ airflow/models.py | 3 + airflow/operators/docker_operator.py | 8 +- airflow/operators/mssql_to_hive.py | 7 +- airflow/operators/mysql_to_hive.py | 7 +- airflow/operators/s3_to_hive_operator.py | 10 +- airflow/task_runner/base_task_runner.py | 2 +- airflow/utils/dag_processing.py | 5 +- docs/integration.rst | 41 +++++ tests/contrib/hooks/test_gcp_cloudml_hook.py | 111 +++++++++++- tests/contrib/hooks/test_spark_submit_hook.py | 6 +- .../contrib/operators/test_cloudml_operator.py | 179 ++++++++++++++----- .../operators/test_spark_submit_operator.py | 31 ++-- tests/jobs.py | 21 ++- tests/operators/docker_operator.py | 7 +- tests/operators/operators.py | 16 ++ 21 files changed, 696 insertions(+), 133 deletions(-) ----------------------------------------------------------------------