Merge branch 'master' into v1-8-test
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/77715b9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/77715b9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/77715b9e Branch: refs/heads/v1-8-test Commit: 77715b9e705f0915fa5c4368eda9d6d4323e2d2d Parents: 44a980d c648327 Author: Bolke de Bruin <bo...@xs4all.nl> Authored: Wed Feb 1 15:54:39 2017 +0000 Committer: Bolke de Bruin <bo...@xs4all.nl> Committed: Wed Feb 1 15:54:39 2017 +0000 ---------------------------------------------------------------------- UPDATING.md | 83 +++++++++++++++++--- airflow/contrib/hooks/gcp_dataflow_hook.py | 33 +++++--- airflow/contrib/operators/dataflow_operator.py | 85 +++++++++++++++++++-- tests/contrib/hooks/gcp_dataflow_hook.py | 56 ++++++++++++++ tests/contrib/operators/dataflow_operator.py | 76 ++++++++++++++++++ 5 files changed, 306 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
