Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 43360200C09 for ; Wed, 25 Jan 2017 23:00:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 41CFE160B4E; Wed, 25 Jan 2017 22:00:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8C7A4160B3D for ; Wed, 25 Jan 2017 23:00:12 +0100 (CET) Received: (qmail 70802 invoked by uid 500); 25 Jan 2017 22:00:11 -0000 Mailing-List: contact commits-help@airflow.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airflow.incubator.apache.org Delivered-To: mailing list commits@airflow.incubator.apache.org Received: (qmail 70793 invoked by uid 99); 25 Jan 2017 22:00:11 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2017 22:00:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 5E7B5C2361 for ; Wed, 25 Jan 2017 22:00:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id D5YxBJ5kXNNp for ; Wed, 25 Jan 2017 22:00:07 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 0F70F5F3BF for ; Wed, 25 Jan 2017 22:00:06 +0000 (UTC) Received: (qmail 70513 invoked by uid 99); 25 Jan 2017 22:00:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2017 22:00:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6E16DE080B; Wed, 25 Jan 2017 22:00:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bolke@apache.org To: commits@airflow.incubator.apache.org Date: Wed, 25 Jan 2017 22:00:09 -0000 Message-Id: In-Reply-To: <1934314d42d4485d886a48f2e8726b68@git.apache.org> References: <1934314d42d4485d886a48f2e8726b68@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] incubator-airflow git commit: Merge branch 'fix_localtaskjob' archived-at: Wed, 25 Jan 2017 22:00:13 -0000 Merge branch 'fix_localtaskjob' Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/5479ac8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/5479ac8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/5479ac8d Branch: refs/heads/v1-8-test Commit: 5479ac8d4ab9bbb4bab839df9f0d5cf0c0e80388 Parents: 4edf913 24d641b Author: Bolke de Bruin Authored: Wed Jan 25 21:36:28 2017 +0100 Committer: Bolke de Bruin Committed: Wed Jan 25 21:36:28 2017 +0100 ---------------------------------------------------------------------- airflow/jobs.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/5479ac8d/airflow/jobs.py ----------------------------------------------------------------------