From 46236a6f5ef9db2a8692b01f1e465618d8d375fc Mon Sep 17 00:00:00 2001
From: obltmachine <150269514+obltmachine@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:48:55 +0000
Subject: [PATCH] [Release] update version 8.17.0

---
 .mergify.yml                   | 14 ++++++++++++++
 cmd/intake-receiver/version.go |  2 +-
 internal/version/version.go    |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index a62731c17d1..e60530f5f53 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -359,3 +359,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.16 branch
+    conditions:
+      - merged
+      - base=8.x
+      - label=backport-8.16
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.16"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
index 740e7426b88..7ba1efbea28 100644
--- a/cmd/intake-receiver/version.go
+++ b/cmd/intake-receiver/version.go
@@ -18,4 +18,4 @@
 package main
 
 // version matches the APM Server's version
-const version = "8.16.0"
+const version = "8.17.0"
diff --git a/internal/version/version.go b/internal/version/version.go
index 26b6c4915d7..e0ffe391498 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -18,4 +18,4 @@
 package version
 
 // Version holds the APM Server version.
-const Version = "8.16.0"
+const Version = "8.17.0"