From d5c8f0bdc4741566ad528a65f2b44d10009cccc3 Mon Sep 17 00:00:00 2001
From: Gil Raphaelli <g@raphaelli.com>
Date: Thu, 21 Feb 2019 15:01:17 -0500
Subject: [PATCH] complete go update to 1.11.5 (#1950) (#1952)

---
 .go-version             | 2 +-
 changelogs/7.0.asciidoc | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.go-version b/.go-version
index 3d0e62313ce..e6dbb7c238f 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.11.4
+1.11.5
diff --git a/changelogs/7.0.asciidoc b/changelogs/7.0.asciidoc
index 3c256f57c0d..d9aab4a18ae 100644
--- a/changelogs/7.0.asciidoc
+++ b/changelogs/7.0.asciidoc
@@ -1,8 +1,6 @@
 [[release-notes-7.0]]
 == APM Server version 7.0
 
-https://github.com/elastic/apm-server/compare/v6.7.0\...v7.0.0[View commits]
-
 ////
 * <<release-notes-7.0.0-rc1>>
 ////
@@ -17,12 +15,16 @@ https://github.com/elastic/apm-server/compare/v6.7.0\...v7.0.0[View commits]
 ==== Bugfix
 
 - Ensure setup cmd uses expected configuration {pull}1934[1934]. 
+- Ensure host.name is not added {pull}1934[1934].
+- Update Go version to 1.11.5 {pull}1840[1840] {pull}1950[1950].
 
 ////
 
 [[release-notes-7.0.0-beta1]]
 === APM Server version 7.0.0-beta1
 
+https://github.com/elastic/apm-server/compare/v6.7.0\...v7.0.0[View commits]
+
 [float]
 ==== Breaking Changes
 - Move fields in ES to be ECS compliant {pull}1766[1766],{pull}1783[1783],{pull}1813[1813],{pull}1836[1836],{pull}1838[1838],{pull}1844[1844],{pull}1848[1848],{pull}1849[1849],{pull}1863[1863],{pull}1870[1870]
@@ -36,7 +38,6 @@ https://github.com/elastic/apm-server/compare/v6.7.0\...v7.0.0[View commits]
 - Rename transaction.span_count.dropped.total to transaction.span_count.dropped {pull}1809[1809].
 - Rename span.hex_id to span.id {pull}1811[1811].
 - Index error.exception as array of objects {pull}1825[1825]
-- Update Go version to 1.11.5 {pull}1840[1840].
 - Change ownership to apm-server user/group for deb/rpm installs {pull}1833[1833].
 - Add observer.version_major {pull}1857[1857].
 - Change transaction.name to keyword, add transaction.name.text {pull}1859[1859].