Version 1.47.0v1.47.0

10 files changed, 27 insertions, 37 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d8748937..25e704736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Gitaly changelog
 
+## v1.47.0
+
+#### Changed
+- Remove member bitmaps when linking to objectpool
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1311
+- Un-dangle dangling objects in object pools
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1297
+
+#### Fixed
+- Log node registration failures
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/
+- Fix Prometheus metric naming errors
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1292
+- Cast FsStat syscall to int64
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1306
+
+#### Other
+- Upgrade protobuf, prometheus and logrus
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1290
+- Replace govendor with 'go mod'
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1286
+
+#### Removed
+- Remove ruby code to create a repository
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1302
+
 ## v1.46.0
 
 #### Added
diff --git a/VERSION b/VERSION
index 0a3db35b2..21998d3c2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.46.0
+1.47.0
diff --git a/changelogs/unreleased/bjk-gitaly_promtool_check_metrics.yml b/changelogs/unreleased/bjk-gitaly_promtool_check_metrics.yml
deleted file mode 100644
index f060b52ac..000000000
--- a/changelogs/unreleased/bjk-gitaly_promtool_check_metrics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Prometheus metric naming errors
-merge_request: 1292
-author:
-type: fixed
diff --git a/changelogs/unreleased/jv-go-mod.yml b/changelogs/unreleased/jv-go-mod.yml
deleted file mode 100644
index 8e9296042..000000000
--- a/changelogs/unreleased/jv-go-mod.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replace govendor with 'go mod'
-merge_request: 1286
-author:
-type: other
diff --git a/changelogs/unreleased/jv-link-remove-bitmap.yml b/changelogs/unreleased/jv-link-remove-bitmap.yml
deleted file mode 100644
index 1b4c19039..000000000
--- a/changelogs/unreleased/jv-link-remove-bitmap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove member bitmaps when linking to objectpool
-merge_request: 1311
-author:
-type: changed
diff --git a/changelogs/unreleased/jv-prometheus-0-9-3.yml b/changelogs/unreleased/jv-prometheus-0-9-3.yml
deleted file mode 100644
index 14f81c2ce..000000000
--- a/changelogs/unreleased/jv-prometheus-0-9-3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade protobuf, prometheus and logrus
-merge_request: 1290
-author:
-type: other
diff --git a/changelogs/unreleased/jv-rescue-dangling.yml b/changelogs/unreleased/jv-rescue-dangling.yml
deleted file mode 100644
index b0c1e859e..000000000
--- a/changelogs/unreleased/jv-rescue-dangling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Un-dangle dangling objects in object pools
-merge_request: 1297
-author:
-type: changed
diff --git a/changelogs/unreleased/zj-int64-fsstat.yml b/changelogs/unreleased/zj-int64-fsstat.yml
deleted file mode 100644
index 9ca699352..000000000
--- a/changelogs/unreleased/zj-int64-fsstat.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-title: Cast FsStat syscall to int64
-type: fixed
-merge_request: 1306
diff --git a/changelogs/unreleased/zj-register-node-fatal-log.yml b/changelogs/unreleased/zj-register-node-fatal-log.yml
deleted file mode 100644
index bd4586525..000000000
--- a/changelogs/unreleased/zj-register-node-fatal-log.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Log node registration failures
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/zj-remove-create-repository-ruby-code.yml b/changelogs/unreleased/zj-remove-create-repository-ruby-code.yml
deleted file mode 100644
index 5a457c810..000000000
--- a/changelogs/unreleased/zj-remove-create-repository-ruby-code.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-merge_request: 1302
-title: Remove ruby code to create a repository
-type: removed