Skip to content

Commit 1062eca

Browse files
elastic-observability-automation[bot]obltmachinecarsonip
authored
9.5: update docs, mergify, versions and changelogs (#21373)
* [Release] update version 9.6.0 * [Release] update changelogs for 9.5 release * Apply suggestions from code review Co-authored-by: Carson Ip <carsonip@users.noreply.github.com> --------- Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
1 parent ba85c9f commit 1062eca

6 files changed

Lines changed: 33 additions & 4 deletions

File tree

.mergify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,3 +356,12 @@ pull_request_rules:
356356
backport:
357357
branches:
358358
- "9.4"
359+
- name: backport patches to 9.5 branch
360+
conditions:
361+
- merged
362+
- base=main
363+
- label=backport-9.5
364+
actions:
365+
backport:
366+
branches:
367+
- "9.5"

cmd/intake-receiver/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
package main
1919

2020
// version matches the APM Server's version
21-
const version = "9.5.0"
21+
const version = "9.6.0"

docs/release-notes/breaking-changes.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ Breaking changes can impact your Elastic applications, potentially disrupting no
2121
% **Action**<br> Steps for mitigating deprecation impact.
2222
% ::::
2323

24-
% Commenting 9.4.0 release notes until it is released
24+
% ## 9.5.0 [9-5-0]
25+
26+
% Commenting 9.5.0 release notes until it is released
27+
% _No breaking changes_
28+
2529
% ## 9.4.0 [9-4-0]
2630

2731
% _No breaking changes_

docs/release-notes/deprecations.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ Review the deprecated functionality for Elastic APM. While deprecations have no
1818
% **Action**<br> Steps for mitigating deprecation impact.
1919
% ::::
2020

21-
% Commenting 9.4.0 release notes until it is released
21+
% ## 9.5.0 [9-5-0]
22+
23+
% Commenting 9.5.0 release notes until it is released
24+
% _No deprecations_
25+
2226
% ## 9.4.0 [9-4-0]
2327

2428
% _No deprecations_

docs/release-notes/index.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@ To check for security updates, go to [Security announcements for the Elastic sta
2424
% ### Fixes [apm-next-fixes]
2525
% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
2626

27+
% ## 9.5.0 [apm-9.5.0-release-notes]
28+
29+
% ### Features and enhancements [apm-9.5.0-features-enhancements]
30+
% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
31+
32+
% _No new features or enhancements_
33+
34+
% ### Fixes [apm-9.5.0-fixes]
35+
% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
36+
37+
% _No new fixes_
38+
2739
## 9.4.3 [apm-9.4.3-release-notes]
2840

2941
_No new features, enhancements, or fixes._

internal/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
package version
1919

2020
// Version holds the APM Server version.
21-
const Version = "9.5.0"
21+
const Version = "9.6.0"

0 commit comments

Comments
 (0)