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/2ae6a55d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/2ae6a55d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/2ae6a55d Branch: refs/heads/master Commit: 2ae6a55dcc4b5aa6361930a81c1bc40154ceb65f Parents: 2c95456 86063ba Author: Chris Riccomini <criccom...@apache.org> Authored: Wed Sep 6 09:50:47 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Wed Sep 6 09:50:47 2017 -0700 ---------------------------------------------------------------------- airflow/contrib/hooks/bigquery_hook.py | 35 +++++-- airflow/contrib/hooks/datastore_hook.py | 100 +++++++++++++++--- airflow/contrib/hooks/gcp_api_base_hook.py | 20 +++- .../operators/datastore_export_operator.py | 104 +++++++++++++++++++ .../operators/datastore_import_operator.py | 95 +++++++++++++++++ airflow/contrib/operators/gcs_to_bq.py | 12 ++- 6 files changed, 335 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
