Version 1.75.0v1.75.01-75-stable

13 files changed, 32 insertions, 52 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d91200d97..54eb0eff3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Gitaly changelog
 
+## v1.75.0
+
+#### Changed
+- Praefect multiple virtual storage
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1606
+
+#### Fixed
+- Gitaly feature flags are broken: convert underscores to dashes
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1659
+- Allow internal fetches to see all hidden references
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1640
+- SSHUpload{Pack,Archive}: fix timeout tests
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1664
+- Restore gitaly_connections_total prometheus metric
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1657
+
+#### Other
+- Add labkit healthcheck
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1646
+- Configure logging as early as possible
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1666
+- Use internal socket dir for internal gitaly socket
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1642
+- Leverage the bootstrap package to support Praefect zero downtime deploys
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1638
+
+#### Security
+- Limit the negotiation phase for certain Gitaly RPCs
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/
+
 ## v1.74.0
 
 #### Added
diff --git a/VERSION b/VERSION
index dc87e8af8..7c7053aa2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.74.0
+1.75.0
diff --git a/changelogs/unreleased/fix_keep_around_ref.yml b/changelogs/unreleased/fix_keep_around_ref.yml
deleted file mode 100644
index 3b8fab1a7..000000000
--- a/changelogs/unreleased/fix_keep_around_ref.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow internal fetches to see all hidden references
-merge_request: 1640
-author:
-type: fixed
diff --git a/changelogs/unreleased/jc-add-labkit-healthcheck-back.yml b/changelogs/unreleased/jc-add-labkit-healthcheck-back.yml
deleted file mode 100644
index c353f6e34..000000000
--- a/changelogs/unreleased/jc-add-labkit-healthcheck-back.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add labkit healthcheck
-merge_request: 1646
-author:
-type: other
diff --git a/changelogs/unreleased/jc-fix-unstructured-startup-logging.yml b/changelogs/unreleased/jc-fix-unstructured-startup-logging.yml
deleted file mode 100644
index fb0752112..000000000
--- a/changelogs/unreleased/jc-fix-unstructured-startup-logging.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Configure logging as early as possible
-merge_request: 1666
-author:
-type: other
diff --git a/changelogs/unreleased/jc-gitaly-internal-socket.yml b/changelogs/unreleased/jc-gitaly-internal-socket.yml
deleted file mode 100644
index 267cab425..000000000
--- a/changelogs/unreleased/jc-gitaly-internal-socket.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use internal socket dir for internal gitaly socket
-merge_request: 1642
-author:
-type: other
diff --git a/changelogs/unreleased/jc-praefect-multiple-virtual-storage.yml b/changelogs/unreleased/jc-praefect-multiple-virtual-storage.yml
deleted file mode 100644
index 56bd79024..000000000
--- a/changelogs/unreleased/jc-praefect-multiple-virtual-storage.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Praefect multiple virtual storage
-merge_request: 1606
-author:
-type: changed
diff --git a/changelogs/unreleased/jc-zero-downtime-praefect.yml b/changelogs/unreleased/jc-zero-downtime-praefect.yml
deleted file mode 100644
index f8f922677..000000000
--- a/changelogs/unreleased/jc-zero-downtime-praefect.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Leverage the bootstrap package to support Praefect zero downtime deploys
-merge_request: 1638
-author:
-type: other
diff --git a/changelogs/unreleased/jv-fix-ssh-timeout-test.yml b/changelogs/unreleased/jv-fix-ssh-timeout-test.yml
deleted file mode 100644
index 90e1d46e4..000000000
--- a/changelogs/unreleased/jv-fix-ssh-timeout-test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'SSHUpload{Pack,Archive}: fix timeout tests'
-merge_request: 1664
-author:
-type: fixed
diff --git a/changelogs/unreleased/jv-restore-connection-counter.yml b/changelogs/unreleased/jv-restore-connection-counter.yml
deleted file mode 100644
index d7fcbdf9d..000000000
--- a/changelogs/unreleased/jv-restore-connection-counter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Restore gitaly_connections_total prometheus metric
-merge_request: 1657
-author:
-type: fixed
diff --git a/changelogs/unreleased/ps-feature-flag-name-convertion.yml b/changelogs/unreleased/ps-feature-flag-name-convertion.yml
deleted file mode 100644
index ef8cec605..000000000
--- a/changelogs/unreleased/ps-feature-flag-name-convertion.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Gitaly feature flags are broken: convert underscores to dashes'
-merge_request: 1659
-author:
-type: fixed
diff --git a/changelogs/unreleased/security-limit-rpc-negotiation-phase.yml b/changelogs/unreleased/security-limit-rpc-negotiation-phase.yml
deleted file mode 100644
index 0f27721e8..000000000
--- a/changelogs/unreleased/security-limit-rpc-negotiation-phase.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Limit the negotiation phase for certain Gitaly RPCs
-merge_request:
-author:
-type: security
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 55a74dc3b..d6d95d4a2 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
 # This file was auto-generated by _support/release
 module Gitaly
-  VERSION = '1.74.0'
+  VERSION = '1.75.0'
 end