From 730d6c06a40b90c48bdc004b466dcea00c7b1392 Mon Sep 17 00:00:00 2001
From: simitt <silvia.mitter@elastic.co>
Date: Wed, 16 Oct 2019 10:17:41 +0200
Subject: [PATCH] Update version information to 7.5

Update to 7.5 as upcoming release branch.
---
 Makefile                             | 4 ++--
 _beats/libbeat/docs/version.asciidoc | 4 ++--
 docs/version.asciidoc                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0ef0a3af442..fb0e9b48f35 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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
diff --git a/_beats/libbeat/docs/version.asciidoc b/_beats/libbeat/docs/version.asciidoc
index 2ea6690073e..2c0ac5220ac 100644
--- a/_beats/libbeat/docs/version.asciidoc
+++ b/_beats/libbeat/docs/version.asciidoc
@@ -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
diff --git a/docs/version.asciidoc b/docs/version.asciidoc
index ca281b06ae7..f1093fa61b2 100644
--- a/docs/version.asciidoc
+++ b/docs/version.asciidoc
@@ -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