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>2019-02-27 12:35:31 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-02-27 12:35:31 +0300
commitd92c70a3e87a9fabccdbff5e88548b62e4f77efb (patch)
tree4dbdbe07ae1f7c0ba56996c257830ee825230ffd
parent4640fcfd55ff44a3e6535421dbd40ac192d31473 (diff)
Version 1.22.0v1.22.0
-rw-r--r--CHANGELOG.md14
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/an-spawn-span-propagation.yml5
-rw-r--r--changelogs/unreleased/re-implement-findbranch.yml5
-rw-r--r--changelogs/unreleased/update-hook-env.yml5
5 files changed, 15 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6130e3c3..2a20270c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Gitaly changelog
+## v1.22.0
+
+#### Fixed
+- Pass GL_PROTOCOL and GL_REPOSITORY to update hook
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1082
+
+#### Other
+- Support distributed tracing in child processes
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1085
+
+#### Removed
+- Removing find_branch ruby implementation
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1096
+
## v1.21.0
#### Added
diff --git a/VERSION b/VERSION
index 3500250a4..57807d6d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.21.0
+1.22.0
diff --git a/changelogs/unreleased/an-spawn-span-propagation.yml b/changelogs/unreleased/an-spawn-span-propagation.yml
deleted file mode 100644
index 43dd9ff75..000000000
--- a/changelogs/unreleased/an-spawn-span-propagation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support distributed tracing in child processes
-merge_request: 1085
-author:
-type: other
diff --git a/changelogs/unreleased/re-implement-findbranch.yml b/changelogs/unreleased/re-implement-findbranch.yml
deleted file mode 100644
index c84fef78c..000000000
--- a/changelogs/unreleased/re-implement-findbranch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Removing find_branch ruby implementation
-merge_request: 1096
-author:
-type: removed
diff --git a/changelogs/unreleased/update-hook-env.yml b/changelogs/unreleased/update-hook-env.yml
deleted file mode 100644
index 59b642ae5..000000000
--- a/changelogs/unreleased/update-hook-env.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Pass GL_PROTOCOL and GL_REPOSITORY to update hook
-merge_request: 1082
-author:
-type: fixed