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-06-20 15:46:32 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-06-20 15:46:32 +0300
commit215833243e8e6fa7d946ae6e74fe60e0cda2ce59 (patch)
tree301ce2a1131fe4e9b27b7048e392f78ae2a1e891
parent171dbd49fd19fa6f76fb1a8300a883fc2ae8c487 (diff)
Version 1.42.4
-rw-r--r--CHANGELOG.md10
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/jc-fix-stderr-log-writer.yml5
-rw-r--r--changelogs/unreleased/pb-get-object-directory-size-1-42.yml5
4 files changed, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e97114e04..1a5db25a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Gitaly changelog
+## v1.42.4
+
+#### Added
+- Add GetObjectDirectorySize RPC
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1318
+
+#### Fixed
+- Fix stderr log writer
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1275
+
## v1.42.3
#### Fixed
diff --git a/VERSION b/VERSION
index 975492089..6f7c8cdab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.42.3
+1.42.4
diff --git a/changelogs/unreleased/jc-fix-stderr-log-writer.yml b/changelogs/unreleased/jc-fix-stderr-log-writer.yml
deleted file mode 100644
index f39e0fe23..000000000
--- a/changelogs/unreleased/jc-fix-stderr-log-writer.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix stderr log writer
-merge_request: 1275
-author:
-type: fixed
diff --git a/changelogs/unreleased/pb-get-object-directory-size-1-42.yml b/changelogs/unreleased/pb-get-object-directory-size-1-42.yml
deleted file mode 100644
index 3d08f3e12..000000000
--- a/changelogs/unreleased/pb-get-object-directory-size-1-42.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add GetObjectDirectorySize RPC
-merge_request: 1318
-author:
-type: added