Skip to content

Commit c12971a

Browse files
elastic-observability-automation[bot]obltmachineaelnahas
authored
9.4: update docs, mergify, versions and changelogs (#20864)
* [Release] update version 9.5.0 * [Release] update changelogs for 9.4 release * comment out 9.4.0 release notes --------- Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> Co-authored-by: Ahmed ElNahas <ahmed.elnahas@elastic.co>
1 parent 2b87820 commit c12971a

File tree

6 files changed

+34
-2
lines changed

6 files changed

+34
-2
lines changed

.mergify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,3 +345,12 @@ pull_request_rules:
345345
backport:
346346
branches:
347347
- "9.3"
348+
- name: backport patches to 9.4 branch
349+
conditions:
350+
- merged
351+
- base=main
352+
- label=backport-9.4
353+
actions:
354+
backport:
355+
branches:
356+
- "9.4"

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.4.0"
21+
const version = "9.5.0"

docs/release-notes/breaking-changes.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +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
25+
% ## 9.4.0 [9-4-0]
26+
27+
% _No breaking changes_
28+
2429
## 9.3.0 [9-3-0]
2530

2631
_No breaking changes_

docs/release-notes/deprecations.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +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
22+
% ## 9.4.0 [9-4-0]
23+
24+
% _No deprecations_
25+
2126
## 9.3.0 [9-3-0]
2227

2328
_No deprecations_

docs/release-notes/index.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,19 @@ 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+
% Commenting 9.4.0 release notes until it is released
28+
% ## 9.4.0 [apm-9.4.0-release-notes]
29+
30+
% ### Features and enhancements [apm-9.4.0-features-enhancements]
31+
% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
32+
33+
% _No new features or enhancements_
34+
35+
% ### Fixes [apm-9.4.0-fixes]
36+
% * 1 sentence describing the change. ([#PR number](https://github.com/elastic/apm-server/pull/PR number))
37+
38+
% _No new fixes_
39+
2740
## 9.3.3 [apm-9.3.3-release-notes]
2841

2942
_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.4.0"
21+
const Version = "9.5.0"

0 commit comments

Comments
 (0)