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 2016/06/29 03:19:02 UTC

[3/3] incubator-airflow git commit: Merge pull request #1586 from criccomini/AIRFLOW-200

Merge pull request #1586 from criccomini/AIRFLOW-200


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/7b382b4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/7b382b4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/7b382b4e

Branch: refs/heads/master
Commit: 7b382b4e928b96c08890317b2b09d22163882a8a
Parents: be6766a dc84fde
Author: Chris Riccomini <ch...@wepay.com>
Authored: Tue Jun 28 20:18:46 2016 -0700
Committer: Chris Riccomini <ch...@wepay.com>
Committed: Tue Jun 28 20:18:46 2016 -0700

----------------------------------------------------------------------
 .../example_dags/example_qubole_operator.py     |   5 +-
 .../contrib/example_dags/example_twitter_dag.py |   3 +-
 airflow/contrib/hooks/__init__.py               |  22 +--
 airflow/contrib/operators/__init__.py           |  22 +--
 .../operators/bigquery_check_operator.py        |   2 +-
 airflow/contrib/operators/qubole_operator.py    |   2 +-
 airflow/contrib/operators/vertica_operator.py   |   2 +-
 airflow/contrib/operators/vertica_to_hive.py    |   2 +-
 airflow/example_dags/example_bash_operator.py   |   3 +-
 airflow/example_dags/example_branch_operator.py |   3 +-
 .../example_branch_python_dop_operator_3.py     |   3 +-
 airflow/example_dags/example_http_operator.py   |   2 +-
 .../example_passing_params_via_test_command.py  |   3 +-
 airflow/example_dags/example_python_operator.py |   2 +-
 .../example_short_circuit_operator.py           |   3 +-
 airflow/example_dags/example_skip_dag.py        |   2 +-
 airflow/example_dags/example_subdag_operator.py |   3 +-
 .../example_trigger_controller_dag.py           |   2 +-
 .../example_dags/example_trigger_target_dag.py  |   3 +-
 airflow/example_dags/example_xcom.py            |   6 +-
 airflow/example_dags/subdags/subdag.py          |   2 +-
 airflow/example_dags/test_utils.py              |   2 +-
 airflow/example_dags/tutorial.py                |   2 +-
 airflow/hooks/__init__.py                       |  31 ++--
 airflow/operators/__init__.py                   |  70 +++------
 airflow/operators/check_operator.py             |   2 +-
 airflow/operators/http_operator.py              |   2 +-
 airflow/operators/presto_check_operator.py      |   2 +-
 airflow/operators/sensors.py                    |   4 +-
 airflow/operators/sqlite_operator.py            |   2 +-
 airflow/utils/helpers.py                        | 144 +++++++++++++++----
 airflow/utils/logging.py                        |   2 +-
 airflow/www/views.py                            |   3 +-
 docs/concepts.rst                               |   4 +-
 docs/tutorial.rst                               |   6 +-
 tests/core.py                                   |  71 +++++----
 tests/dags/test_backfill_pooled_tasks.py        |   2 +-
 tests/dags/test_issue_1225.py                   |   4 +-
 tests/dags/test_scheduler_dags.py               |   2 +-
 tests/jobs.py                                   |   2 +-
 tests/models.py                                 |   4 +-
 tests/operators/subdag_operator.py              |   4 +-
 42 files changed, 258 insertions(+), 204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/7b382b4e/airflow/www/views.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/7b382b4e/tests/core.py
----------------------------------------------------------------------