Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/6.8' into feature/ci-2.0-6.8
Browse files Browse the repository at this point in the history
* upstream/6.8:
  Edit 6.8.13 release notes (elastic#22108)
  Cherry-pick elastic#21981 to 6.8: fix the url of reviewdog (elastic#22071)
  • Loading branch information
v1v committed Oct 29, 2020
2 parents 3213d4d + 5cab152 commit cf4d33b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*")
Expand Down

0 comments on commit cf4d33b

Please sign in to comment.