From 813f2bee1fb5b58753693682c1c2f7102fadbc37 Mon Sep 17 00:00:00 2001
From: Silvia Mitter <silvia.mitter@elastic.co>
Date: Mon, 28 Dec 2020 18:57:59 +0100
Subject: [PATCH] Update changelog to 7.11 (#4561)

---
 CHANGELOG.asciidoc       |  1 +
 changelogs/7.11.asciidoc | 35 +++++++++++++++++++++++++++++++++++
 changelogs/head.asciidoc | 18 +-----------------
 3 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 changelogs/7.11.asciidoc

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 880f8627cdb..cb89b028676 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,4 +1,5 @@
 include::./changelogs/head.asciidoc[]
+include::./changelogs/7.11.asciidoc[]
 include::./changelogs/7.10.asciidoc[]
 include::./changelogs/7.9.asciidoc[]
 include::./changelogs/7.8.asciidoc[]
diff --git a/changelogs/7.11.asciidoc b/changelogs/7.11.asciidoc
new file mode 100644
index 00000000000..8d68b569c95
--- /dev/null
+++ b/changelogs/7.11.asciidoc
@@ -0,0 +1,35 @@
+[[release-notes-7.11]]
+== APM Server version 7.11
+
+https://github.com/elastic/apm-server/compare/7.10\...7.11[View commits]
+
+* <<release-notes-7.11.0>>
+
+[float]
+[[release-notes-7.11.0]]
+=== APM Server version 7.11.0
+
+[float]
+==== Bug fixes
+* JSON schema metricset: nest type and subtype under span {pull}4329[4329]
+* JSON schema metricset: nest type and name under transaction {pull}4329[4329]
+* Carriage returns are now stripped from source-mapped context source lines {pull}4348[4348]
+* Remove config defaults from `apm-server export config` {pull}4458[4458]
+
+[float]
+==== Intake API Changes
+* Intake RUM v3: Changed error messages for invalid events due to internal changes of decoder logic {pull}4358[4358]
+* Auto-generate JSON schemas for Intake API v2 and v3/rum {pull}4393[4393]
+
+[float]
+==== Added
+* Monitoring for aggregation of transaction metrics {pull}4287[4287]
+* Log warnings in aggregation of transaction metrics when grouping limit is reached {pull}4313[4313]
+* Configurable tail-based sampling policies {pull}4320[4320]
+* Monitoring and telemetry for tail-based sampling {pull}4346[4346] {pull}4360[4360]
+* Experimental support for data streams {pull}4409[4409]
+* Label/custom/mark keys are now sanitized (rather than validated and rejected) by the server {pull}4465[4465]
+* Upgrade Go to 1.14.12 {pull}4478[4478]
+* Added apm-server.response_headers config {pull}4523[4523]
+* Switch logging format to be ECS compliant where possible {pull}3829[3829]
+* Switch from `keyword` to `wildcard` in alignment with ECS 1.7 {pull}4577[4577]
\ No newline at end of file
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index 64205289c16..3f3796b11e3 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -1,32 +1,16 @@
 [[release-notes-head]]
 == APM Server version HEAD
 
-https://github.com/elastic/apm-server/compare/7.10\...master[View commits]
+https://github.com/elastic/apm-server/compare/7.11\...master[View commits]
 
 [float]
 ==== Breaking Changes
 
 [float]
 ==== Bug fixes
-* JSON schema metricset: nest type and subtype under span {pull}4329[4329]
-* JSON schema metricset: nest type and name under transaction {pull}4329[4329]
-* Carriage returns are now stripped from source-mapped context source lines {pull}4348[4348]
-* Remove config defaults from `apm-server export config` {pull}4458[4458]
 
 [float]
 ==== Intake API Changes
-* Intake RUM v3: Changed error messages for invalid events due to internal changes of decoder logic {pull}4358[4358]
-* Auto-generate JSON schemas for Intake API v2 and v3/rum {pull}4393[4393]
 
 [float]
 ==== Added
-* Monitoring for aggregation of transaction metrics {pull}4287[4287]
-* Log warnings in aggregation of transaction metrics when grouping limit is reached {pull}4313[4313]
-* Configurable tail-based sampling policies {pull}4320[4320]
-* Monitoring and telemetry for tail-based sampling {pull}4346[4346] {pull}4360[4360]
-* Experimental support for data streams {pull}4409[4409]
-* Label/custom/mark keys are now sanitized (rather than validated and rejected) by the server {pull}4465[4465]
-* Upgrade Go to 1.14.12 {pull}4478[4478]
-* Added apm-server.response_headers config {pull}4523[4523]
-* Switch logging format to be ECS compliant where possible {pull}3829[3829]
-* Switch from `keyword` to `wildcard` in alignment with ECS 1.7 {pull}4577[4577]
\ No newline at end of file