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/572ca475 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/572ca475 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/572ca475 Branch: refs/heads/master Commit: 572ca4759e2805cdd1a45517934d6bd61248ed11 Parents: 971d08c e414844 Author: Chris Riccomini <criccom...@apache.org> Authored: Wed Jun 28 15:23:18 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Wed Jun 28 15:23:18 2017 -0700 ---------------------------------------------------------------------- airflow/bin/cli.py | 5 +---- airflow/config_templates/default_airflow.cfg | 7 ------- airflow/config_templates/default_test.cfg | 2 -- airflow/contrib/operators/dataproc_operator.py | 22 +++++++++++++++++---- 4 files changed, 19 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
