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:
authorJacob Vosmaer <jacob@gitlab.com>2018-12-21 14:12:18 +0300
committerJacob Vosmaer <jacob@gitlab.com>2018-12-21 14:12:18 +0300
commite1b6614a53e96740129fc00df617d6adb04b2431 (patch)
tree64da4732e38b1e83ea7e25b0df81fbefc214690c
parentf7692ecc8e936c67319e6cf8328badc99871575a (diff)
Version 1.11.0v1.11.0
-rw-r--r--CHANGELOG.md8
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/deduplicate-ssl-certs.yml5
-rw-r--r--changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml5
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44d3ea1a5..d8c280d07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Gitaly changelog
+## v1.11.0
+
+#### Fixed
+- Fix incorrect tree entries retrieved with directories that have curly braces
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1013
+- Deduplicate CA in gitaly tls
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1005
+
## v1.10.0
#### Added
diff --git a/VERSION b/VERSION
index 81c871de4..1cac385c6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.10.0
+1.11.0
diff --git a/changelogs/unreleased/deduplicate-ssl-certs.yml b/changelogs/unreleased/deduplicate-ssl-certs.yml
deleted file mode 100644
index d626f81dc..000000000
--- a/changelogs/unreleased/deduplicate-ssl-certs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Deduplicate CA in gitaly tls
-merge_request: 1005
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml b/changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml
deleted file mode 100644
index 45ee9f6f6..000000000
--- a/changelogs/unreleased/sh-fix-filenames-with-curly-braces.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix incorrect tree entries retrieved with directories that have curly braces
-merge_request: 1013
-author:
-type: fixed