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.md8
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/sh-bump-rouge-3-2-1.yml5
-rw-r--r--changelogs/unreleased/sh-bump-rugged-0-27-4.yml5
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b3fdccba..f730d8b9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Gitaly changelog
+## v0.117.1
+
+#### Security
+- Bump rouge to 3.2.1
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/862
+- Bump rugged to 0.27.4 for security fixes
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/856
+
## v0.117.0
#### Performance
diff --git a/VERSION b/VERSION
index a38b3bd31..90bdef2ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.117.0
+0.117.1
diff --git a/changelogs/unreleased/sh-bump-rouge-3-2-1.yml b/changelogs/unreleased/sh-bump-rouge-3-2-1.yml
deleted file mode 100644
index f7ccd906a..000000000
--- a/changelogs/unreleased/sh-bump-rouge-3-2-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump rouge to 3.2.1
-merge_request: 862
-author:
-type: security
diff --git a/changelogs/unreleased/sh-bump-rugged-0-27-4.yml b/changelogs/unreleased/sh-bump-rugged-0-27-4.yml
deleted file mode 100644
index e541bfd04..000000000
--- a/changelogs/unreleased/sh-bump-rugged-0-27-4.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump rugged to 0.27.4 for security fixes
-merge_request: 856
-author:
-type: security