You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by jl...@apache.org on 2016/05/09 23:21:15 UTC
[3/3] incubator-airflow git commit: Merge pull request #1378 from
jlowin/queued-tasks
Merge pull request #1378 from jlowin/queued-tasks
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/40b3fffa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/40b3fffa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/40b3fffa
Branch: refs/heads/master
Commit: 40b3fffa07134afe9c87608e6439589db133edb0
Parents: 385add2 c1aa93f
Author: jlowin <jl...@users.noreply.github.com>
Authored: Mon May 9 19:20:37 2016 -0400
Committer: jlowin <jl...@users.noreply.github.com>
Committed: Mon May 9 19:20:37 2016 -0400
----------------------------------------------------------------------
airflow/executors/base_executor.py | 33 ++++++++++++++++------
airflow/executors/celery_executor.py | 1 +
airflow/executors/local_executor.py | 2 +-
airflow/jobs.py | 46 ++++++-------------------------
airflow/models.py | 19 +++++++++----
tests/dags/test_issue_1225.py | 16 ++++++++++-
tests/jobs.py | 20 +++++++++++---
7 files changed, 80 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/40b3fffa/airflow/jobs.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/40b3fffa/airflow/models.py
----------------------------------------------------------------------