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:55 UTC

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

Branch: refs/heads/master
Commit: f1f0d23e5d17dc77e7477cc8a327d9fd09891fed
Parents: 173860a b49986c
Author: Chris Riccomini <cr...@apache.org>
Authored: Fri Jul 21 13:04:32 2017 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Fri Jul 21 13:04:32 2017 -0700

----------------------------------------------------------------------
 UPDATING.md                                     |   9 +-
 airflow/bin/cli.py                              |  81 +++---
 airflow/contrib/hooks/ssh_hook.py               | 268 +++++++++++--------
 airflow/contrib/operators/__init__.py           |   2 +-
 airflow/contrib/operators/sftp_operator.py      |  99 +++++++
 .../contrib/operators/ssh_execute_operator.py   | 159 -----------
 airflow/contrib/operators/ssh_operator.py       | 106 ++++++++
 airflow/models.py                               |  50 ++--
 airflow/utils/logging.py                        |  66 +++++
 airflow/www/templates/airflow/ti_log.html       |  40 +++
 airflow/www/views.py                            | 180 +++++++------
 dags/test_dag.py                                |   4 +-
 docs/code.rst                                   |   2 +-
 docs/scheduler.rst                              |  19 +-
 scripts/ci/requirements.txt                     |   1 +
 setup.py                                        |   7 +-
 tests/contrib/hooks/test_ssh_hook.py            |  70 +++++
 tests/contrib/operators/test_sftp_operator.py   | 158 +++++++++++
 .../operators/test_ssh_execute_operator.py      |  95 -------
 tests/contrib/operators/test_ssh_operator.py    |  89 ++++++
 tests/core.py                                   |  52 ----
 tests/models.py                                 | 137 +++++++++-
 tests/operators/python_operator.py              |  88 +++---
 tests/utils/test_dates.py                       |   4 -
 tests/utils/test_logging.py                     |  29 ++
 25 files changed, 1198 insertions(+), 617 deletions(-)
----------------------------------------------------------------------