You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by cr...@apache.org on 2017/09/13 17:39:50 UTC

[06/37] incubator-airflow git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow

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/33eb5015
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/33eb5015
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/33eb5015

Branch: refs/heads/master
Commit: 33eb5015681d8a314f82a6a1ece9975b72035db3
Parents: e8b6988 d231dce
Author: Chris Riccomini <cr...@apache.org>
Authored: Thu Jul 6 11:36:22 2017 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Thu Jul 6 11:36:22 2017 -0700

----------------------------------------------------------------------
 airflow/config_templates/default_test.cfg       |   3 +
 airflow/contrib/hooks/__init__.py               |   3 +-
 airflow/contrib/hooks/gcp_pubsub_hook.py        |  93 ++++++++++
 airflow/contrib/operators/dataproc_operator.py  |   6 +-
 airflow/contrib/operators/pubsub_operator.py    | 170 +++++++++++++++++++
 airflow/executors/celery_executor.py            |  25 ++-
 airflow/utils/email.py                          |   1 +
 airflow/www/utils.py                            |  14 ++
 airflow/www/views.py                            |  20 +--
 tests/contrib/hooks/gcp_pubsub_hook.py          | 102 +++++++++++
 tests/contrib/operators/pubsub_operator.py      |  77 +++++++++
 .../contrib/operators/test_dataproc_operator.py |  12 +-
 tests/www/test_utils.py                         |  36 ++++
 13 files changed, 529 insertions(+), 33 deletions(-)
----------------------------------------------------------------------