Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update version information to 7.5 #2803

Merged
merged 1 commit into from
Oct 16, 2019
Merged

Update version information to 7.5 #2803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COVERAGE_TOOL_REPO?=github.com/elastic/apm-server/vendor/github.com/pierrre/gote
GOIMPORTS_REPO?=github.com/elastic/apm-server/vendor/golang.org/x/tools/cmd/goimports
GOLINT_REPO?=github.com/elastic/apm-server/vendor/github.com/golang/lint/golint
GOLINT_TARGETS?=$(shell go list ./... | grep -v /vendor/)
GOLINT_UPSTREAM?=origin/7.x
GOLINT_UPSTREAM?=origin/7.5
GOLINT_COMMAND=$(shell $(GOLINT) ${GOLINT_TARGETS} | $(REVIEWDOG) -f=golint -diff="git diff $(GOLINT_UPSTREAM)")
GOVENDOR_REPO?=github.com/elastic/apm-server/vendor/github.com/kardianos/govendor
JUNIT_REPORT_REPO?=github.com/elastic/apm-server/vendor/github.com/jstemmer/go-junit-report
Expand All @@ -20,7 +20,7 @@ TESTIFY_TOOL_REPO?=github.com/elastic/apm-server/vendor/github.com/stretchr/test
SYSTEM_TESTS=true
TEST_ENVIRONMENT=true
ES_BEATS?=./_beats
BEATS_VERSION?=7.x
BEATS_VERSION?=7.5
NOW=$(shell date -u '+%Y-%m-%dT%H:%M:%S')
GOBUILD_FLAGS=-i -ldflags "-s -X $(BEAT_PATH)/vendor/github.com/elastic/beats/libbeat/version.buildTime=$(NOW) -X $(BEAT_PATH)/vendor/github.com/elastic/beats/libbeat/version.commit=$(COMMIT_ID)"
MAGE_IMPORT_PATH=${BEAT_PATH}/vendor/github.com/magefile/mage
Expand Down
4 changes: 2 additions & 2 deletions _beats/libbeat/docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
:stack-version: 7.5.0
:doc-branch: 7.x
:doc-branch: 7.5
:go-version: 1.12.10
:release-state: unreleased
:python: 2.7.9
:docker: 1.12
:docker-compose: 1.11
:branch: 7.x
:branch: 7.5
:ecs_version: 1.1
4 changes: 2 additions & 2 deletions docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// doc-branch can be: master, 8.0, 8.1, etc.
// release-state is only: released | prerelease | unreleased

:stack-version: 7.4.0
:stack-version: 7.5.0
:major-version: 7.x
:doc-branch: 7.x
:doc-branch: 7.5
:branch: {doc-branch}
:go-version: 1.12.9
:release-state: unreleased
Expand Down