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/b1e355c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/b1e355c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/b1e355c3 Branch: refs/heads/v1-9-test Commit: b1e355c39b8cd4640e2e4060986a0c54424b8128 Parents: b7cdc13 de59321 Author: Chris Riccomini <criccom...@apache.org> Authored: Fri Sep 1 12:58:39 2017 -0700 Committer: Chris Riccomini <criccom...@apache.org> Committed: Fri Sep 1 12:58:39 2017 -0700 ---------------------------------------------------------------------- README.md | 3 ++- airflow/contrib/operators/dataproc_operator.py | 14 ++++++++++++++ airflow/operators/slack_operator.py | 2 +- tests/contrib/operators/test_dataproc_operator.py | 10 +++++++++- 4 files changed, 26 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
