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:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-09-13 18:40:19 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-09-13 18:40:19 +0300
commit889333e29c31ef19c421ca93e8655c950de30cf6 (patch)
tree2a9f715e37a52adad6608d6e7434c0a19a0c6755
parent8f853e4f6770dd02a5997bc0389e6ada966114f0 (diff)
Version 0.121.0v0.121.0
-rw-r--r--CHANGELOG.md10
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/1209-include-keep-around-and-other-references-in-the-checksum-calculation.yml6
-rw-r--r--changelogs/unreleased/stop-gg-vendor.yml5
4 files changed, 11 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 441ad9b68..e48f8fb7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Gitaly changelog
+## v0.121.0
+
+#### Changed
+- CalculateChecksum: Include keep-around and other references in the checksum calculation
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/731
+
+#### Other
+- Stop vendoring Gitlab::Git
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/883
+
## v0.120.0
#### Added
diff --git a/VERSION b/VERSION
index 99e0d1ed9..61825a7bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.120.0
+0.121.0
diff --git a/changelogs/unreleased/1209-include-keep-around-and-other-references-in-the-checksum-calculation.yml b/changelogs/unreleased/1209-include-keep-around-and-other-references-in-the-checksum-calculation.yml
deleted file mode 100644
index 6cebcc692..000000000
--- a/changelogs/unreleased/1209-include-keep-around-and-other-references-in-the-checksum-calculation.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: 'CalculateChecksum: Include keep-around and other references in the checksum
- calculation'
-merge_request: 731
-author:
-type: changed
diff --git a/changelogs/unreleased/stop-gg-vendor.yml b/changelogs/unreleased/stop-gg-vendor.yml
deleted file mode 100644
index 1b29d9dad..000000000
--- a/changelogs/unreleased/stop-gg-vendor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop vendoring Gitlab::Git
-merge_request: 883
-author:
-type: other