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-11-26 12:22:40 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-11-26 12:22:40 +0300
commit34d0e23d75aa297a56b1aa52b7ce61e10cee8358 (patch)
tree8931ec95521906266693b78e3e284754bf79c264
parent345013d67a73d872df311e92431e2d9d558f08fe (diff)
Version 1.1.0v1.1.0
-rw-r--r--CHANGELOG.md8
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/bvl-only-use-git-update-ref.yml5
-rw-r--r--changelogs/unreleased/remove-grpc-coupling.yml5
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 846ab7ec9..91cb84e46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Gitaly changelog
+## v1.1.0
+
+#### Other
+- Remove grpc dependency from catfile
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/983
+- Don't use rugged when calling write-ref
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/982
+
## v1.0.0
#### Added
diff --git a/VERSION b/VERSION
index 3eefcb9dd..9084fa2f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
+1.1.0
diff --git a/changelogs/unreleased/bvl-only-use-git-update-ref.yml b/changelogs/unreleased/bvl-only-use-git-update-ref.yml
deleted file mode 100644
index e30b6f1c7..000000000
--- a/changelogs/unreleased/bvl-only-use-git-update-ref.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't use rugged when calling write-ref
-merge_request: 982
-author:
-type: other
diff --git a/changelogs/unreleased/remove-grpc-coupling.yml b/changelogs/unreleased/remove-grpc-coupling.yml
deleted file mode 100644
index 7465246d8..000000000
--- a/changelogs/unreleased/remove-grpc-coupling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove grpc dependency from catfile
-merge_request: 983
-author:
-type: other