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/71817093 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/71817093 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/71817093 Branch: refs/heads/v1-9-test Commit: 71817093db67dbf06ca458cb04e3e2bad4517dbf Parents: 3c7ad18 de99aa2 Author: Chris Riccomini <criccom...@apache.org> Authored: Fri Aug 18 14:03:45 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Fri Aug 18 14:03:45 2017 -0700 ---------------------------------------------------------------------- UPDATING.md | 6 + airflow/config_templates/default_airflow.cfg | 7 + airflow/config_templates/default_test.cfg | 2 + airflow/contrib/operators/dataproc_operator.py | 2 + airflow/contrib/operators/druid_operator.py | 47 ++++ airflow/contrib/operators/ssh_operator.py | 10 +- airflow/hooks/druid_hook.py | 215 +++++-------------- .../947454bf1dff_add_ti_job_id_index.py | 38 ++++ ...c56_make_xcom_value_column_a_large_binary.py | 45 ++++ airflow/models.py | 156 ++++++++++---- airflow/operators/hive_to_druid.py | 116 ++++++++-- airflow/ti_deps/deps/trigger_rule_dep.py | 4 +- airflow/utils/db.py | 4 + airflow/www/views.py | 9 +- docs/concepts.rst | 3 +- scripts/ci/requirements.txt | 2 +- setup.py | 5 +- .../contrib/operators/test_dataproc_operator.py | 109 ++++++++++ tests/contrib/operators/test_druid_operator.py | 47 ++++ tests/contrib/operators/test_sftp_operator.py | 84 +++++++- tests/contrib/operators/test_ssh_operator.py | 24 ++- tests/hooks/test_druid_hook.py | 99 +++++++++ tests/models.py | 124 ++++++++++- tests/operators/test_hive_to_druid.py | 132 ++++++++++++ 24 files changed, 1057 insertions(+), 233 deletions(-) ----------------------------------------------------------------------
