[airflow] branch v1-10-test updated (2e807c8 -> 846e9a5)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a change to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.


    omit 2e807c8  Execute job cancel HTTPRequest in Dataproc Hook (#10361)
    omit f300b9c  Make KubernetesExecutor recognize kubernetes_labels (#10412)
     add db72074  Make KubernetesExecutor recognize kubernetes_labels (#10412)
     add b12333d  Update Changelog for 1.10.12rc3
     new 846e9a5  Execute job cancel HTTPRequest in Dataproc Hook (#10361)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (2e807c8)
            \
             N -- N -- N   refs/heads/v1-10-test (846e9a5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

[airflow] 01/01: Execute job cancel HTTPRequest in Dataproc Hook (#10361)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 846e9a5dac46a6bfc64878240c030910eed091f6
Author: Varun Dhussa <26...@users.noreply.github.com>
AuthorDate: Wed Aug 19 14:10:16 2020 +0530

    Execute job cancel HTTPRequest in Dataproc Hook (#10361)
    
    closes: #10357
---
 airflow/contrib/hooks/gcp_dataproc_hook.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow/contrib/hooks/gcp_dataproc_hook.py b/airflow/contrib/hooks/gcp_dataproc_hook.py
index aae4e7a..dec3618 100644
--- a/airflow/contrib/hooks/gcp_dataproc_hook.py
+++ b/airflow/contrib/hooks/gcp_dataproc_hook.py
@@ -337,7 +337,7 @@ class DataProcHook(GoogleCloudBaseHook):
             projectId=project_id,
             region=region,
             jobId=job_id
-        )
+        ).execute(num_retries=self.num_retries)
 
 
 setattr(