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 450D3200C13 for ; Sun, 22 Jan 2017 17:38:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 43DFC160B39; Sun, 22 Jan 2017 16:38:58 +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 93835160B59 for ; Sun, 22 Jan 2017 17:38:57 +0100 (CET) Received: (qmail 72056 invoked by uid 500); 22 Jan 2017 16:38:56 -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 71949 invoked by uid 99); 22 Jan 2017 16:38:56 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2017 16:38:56 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 619051806F7 for ; Sun, 22 Jan 2017 16:38:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id pB6X7Jb1qpUr for ; Sun, 22 Jan 2017 16:38:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id B8B2B5FC0C for ; Sun, 22 Jan 2017 16:38:53 +0000 (UTC) Received: (qmail 71370 invoked by uid 99); 22 Jan 2017 16:38:53 -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; Sun, 22 Jan 2017 16:38:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E0B67F16A5; Sun, 22 Jan 2017 16:38:52 +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: Sun, 22 Jan 2017 16:38:57 -0000 Message-Id: <359fcfa4b73d4ba78a797093ce3edc8d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/7] incubator-airflow git commit: Merge pull request #2010 from gsakkis/fixes archived-at: Sun, 22 Jan 2017 16:38:58 -0000 Merge pull request #2010 from gsakkis/fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a2b0ea32 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a2b0ea32 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a2b0ea32 Branch: refs/heads/v1-8-test Commit: a2b0ea322694409a43f05275ded8acb47b809e98 Parents: 2acb10a 2d2d627 Author: Bolke de Bruin Authored: Sun Jan 22 17:36:04 2017 +0100 Committer: Bolke de Bruin Committed: Sun Jan 22 17:36:04 2017 +0100 ---------------------------------------------------------------------- airflow/jobs.py | 8 +------- airflow/task_runner/__init__.py | 2 +- setup.py | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/a2b0ea32/setup.py ----------------------------------------------------------------------