From 6741ca16363f98196d09b49dd068c5ce84338145 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 22 Oct 2020 17:25:16 +0200 Subject: [PATCH 1/2] Cherry-pick #21981 to 6.8: fix the url of reviewdog (#22071) * Fix the url of reviewdog (#21981) (cherry picked from commit 215f49cf50a079d5f0963eeab3d1336d897c36f9) Co-authored-by: Ichinose Shogo --- Makefile | 2 +- libbeat/scripts/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7005f806e447..660de6d73b87 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ GOLINT=golint GOLINT_REPO=github.com/golang/lint/golint REVIEWDOG=reviewdog REVIEWDOG_OPTIONS?=-diff "git diff master" -REVIEWDOG_REPO=github.com/haya14busa/reviewdog/cmd/reviewdog +REVIEWDOG_REPO=github.com/reviewdog/reviewdog/cmd/reviewdog XPACK_SUFFIX=x-pack/ # PROJECTS_XPACK_PKG is a list of Beats that have independent packaging support diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index e44949d3cb70..25e00ee4779c 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -54,7 +54,7 @@ GOLINT=golint GOLINT_REPO?=github.com/golang/lint/golint REVIEWDOG?=reviewdog -conf ${ES_BEATS}/reviewdog.yml REVIEWDOG_OPTIONS?=-diff "git diff master" -REVIEWDOG_REPO?=github.com/haya14busa/reviewdog/cmd/reviewdog +REVIEWDOG_REPO?=github.com/reviewdog/reviewdog/cmd/reviewdog PROCESSES?= 4 TIMEOUT?= 90 PYTHON_TEST_FILES?=$(shell find . -type f -name 'test_*.py' -not -path "*/build/*" -not -path "*/vendor/*") From 5cab1521847a6768eb19c386ce62f75ab8e7facc Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Thu, 22 Oct 2020 17:27:53 -0700 Subject: [PATCH 2/2] Edit 6.8.13 release notes (#22108) --- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index d34752c84dfe..7001c4a9189a 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -11,7 +11,7 @@ https://github.com/elastic/beats/compare/v6.8.12...v6.8.13[View commits] *Filebeat* -- Add container image in Kubernetes metadata {pull}13356[13356] {issue}12688[12688] +- Add container image in Kubernetes metadata. {pull}13356[13356] {issue}12688[12688] [[release-notes-6.8.12]]