Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/jv-sketch-cache-data-structure.yml5
3 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2adbefcce..f41733076 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Gitaly changelog
+## v1.42.0
+
+#### Other
+- Use simpler data structure for cat-file cache
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1233
+
## v1.41.0
#### Added
diff --git a/VERSION b/VERSION
index 7d47e5998..a50908ca3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.41.0
+1.42.0
diff --git a/changelogs/unreleased/jv-sketch-cache-data-structure.yml b/changelogs/unreleased/jv-sketch-cache-data-structure.yml
deleted file mode 100644
index 83fc834f7..000000000
--- a/changelogs/unreleased/jv-sketch-cache-data-structure.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use simpler data structure for cat-file cache
-merge_request: 1233
-author:
-type: other