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 ED77F200D27 for ; Wed, 13 Sep 2017 18:50:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EC32B1609CF; Wed, 13 Sep 2017 16:50:21 +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 058521609D1 for ; Wed, 13 Sep 2017 18:50:20 +0200 (CEST) Received: (qmail 80058 invoked by uid 500); 13 Sep 2017 16:50:19 -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 79420 invoked by uid 99); 13 Sep 2017 16:50:19 -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, 13 Sep 2017 16:50:19 +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 CBA4FD4A7F for ; Wed, 13 Sep 2017 16:50:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.221 X-Spam-Level: X-Spam-Status: No, score=-4.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] 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 WP4lfeBdQo3m for ; Wed, 13 Sep 2017 16:50:16 +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 6DBF85FC1C for ; Wed, 13 Sep 2017 16:50:16 +0000 (UTC) Received: (qmail 79103 invoked by uid 99); 13 Sep 2017 16:50:16 -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, 13 Sep 2017 16:50:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86FC9F580C; Wed, 13 Sep 2017 16:50:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: criccomini@apache.org To: commits@airflow.incubator.apache.org Date: Wed, 13 Sep 2017 16:50:21 -0000 Message-Id: <58b34fdb912042f3a59491e8b80989e7@git.apache.org> In-Reply-To: <17f10fdda693434cae047c1162f614d5@git.apache.org> References: <17f10fdda693434cae047c1162f614d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/36] incubator-airflow git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-airflow archived-at: Wed, 13 Sep 2017 16:50:22 -0000 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/0809ee9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/0809ee9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/0809ee9d Branch: refs/heads/v1-9-test Commit: 0809ee9db93936827a4417b9d7e018d3321e8b45 Parents: 33eb501 f5ffb9d Author: Chris Riccomini Authored: Wed Jul 12 10:08:37 2017 -0700 Committer: Chris Riccomini Committed: Wed Jul 12 10:08:37 2017 -0700 ---------------------------------------------------------------------- README.md | 2 + airflow/contrib/hooks/gcp_cloudml_hook.py | 82 ++++----- airflow/contrib/hooks/spark_submit_hook.py | 8 +- airflow/contrib/operators/cloudml_operator.py | 148 ++++++++++++++- airflow/hooks/hive_hooks.py | 29 ++- ...dc7_add_max_tries_column_to_task_instance.py | 106 +++++++++++ airflow/models.py | 3 + airflow/operators/docker_operator.py | 8 +- airflow/operators/mssql_to_hive.py | 7 +- airflow/operators/mysql_to_hive.py | 7 +- airflow/operators/s3_to_hive_operator.py | 10 +- airflow/task_runner/base_task_runner.py | 2 +- airflow/utils/dag_processing.py | 5 +- docs/integration.rst | 41 +++++ tests/contrib/hooks/test_gcp_cloudml_hook.py | 111 +++++++++++- tests/contrib/hooks/test_spark_submit_hook.py | 6 +- .../contrib/operators/test_cloudml_operator.py | 179 ++++++++++++++----- .../operators/test_spark_submit_operator.py | 31 ++-- tests/jobs.py | 21 ++- tests/operators/docker_operator.py | 7 +- tests/operators/operators.py | 16 ++ 21 files changed, 696 insertions(+), 133 deletions(-) ----------------------------------------------------------------------