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/efa1de6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/efa1de6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/efa1de6d Branch: refs/heads/v1-9-test Commit: efa1de6dbd3e37ec7d9c935e6ef1565d2d1999cb Parents: c0863e3 e88ecff Author: Chris Riccomini <criccom...@apache.org> Authored: Thu Jul 13 17:05:31 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Thu Jul 13 17:05:31 2017 -0700 ---------------------------------------------------------------------- README.md | 2 + airflow/bin/cli.py | 2 +- airflow/contrib/hooks/bigquery_hook.py | 6 +++ airflow/contrib/hooks/gcp_cloudml_hook.py | 44 +++++++++--------- airflow/contrib/operators/cloudml_operator.py | 47 ++++++++++---------- airflow/contrib/operators/gcs_to_bq.py | 5 +++ tests/contrib/hooks/test_gcp_cloudml_hook.py | 20 ++++----- .../contrib/operators/test_cloudml_operator.py | 2 +- 8 files changed, 71 insertions(+), 57 deletions(-) ----------------------------------------------------------------------