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:
authorPaul Okstad <pokstad@gitlab.com>2019-10-17 23:27:35 +0300
committerPaul Okstad <pokstad@gitlab.com>2019-10-17 23:27:35 +0300
commit17fa67d3aed626760a20c82c8743681f328e322f (patch)
tree1d320c19f29fb08d06c755c414abe352414e4351
parent5a198d34452e7dc3b35eb79ee3e721362a52f366 (diff)
Version v1.70.0
-rw-r--r--CHANGELOG.md12
-rw-r--r--VERSION2
-rw-r--r--changelogs/unreleased/po-praefect-refactor-e2e.yml5
-rw-r--r--changelogs/unreleased/po-server-keep-alive.yml5
-rw-r--r--changelogs/unreleased/zj-remove-write-config.yml5
-rw-r--r--ruby/proto/gitaly/version.rb2
6 files changed, 14 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da60ce32b..f71e7584e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Gitaly changelog
+## vv1.70.0
+
+#### Added
+- Lower gRPC server inactivity ping timeout
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1294
+
+#### Other
+- Remove RepositoryService WriteConfig
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1558
+- Refactor praefect server tests
+ https://gitlab.com/gitlab-org/gitaly/merge_requests/1554
+
## v1.69.0
#### Fixed
diff --git a/VERSION b/VERSION
index 493498565..d0109c6f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.69.0
+v1.70.0
diff --git a/changelogs/unreleased/po-praefect-refactor-e2e.yml b/changelogs/unreleased/po-praefect-refactor-e2e.yml
deleted file mode 100644
index 781633708..000000000
--- a/changelogs/unreleased/po-praefect-refactor-e2e.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor praefect server tests
-merge_request: 1554
-author:
-type: other
diff --git a/changelogs/unreleased/po-server-keep-alive.yml b/changelogs/unreleased/po-server-keep-alive.yml
deleted file mode 100644
index d763e0120..000000000
--- a/changelogs/unreleased/po-server-keep-alive.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Lower gRPC server inactivity ping timeout
-merge_request: 1294
-author:
-type: added
diff --git a/changelogs/unreleased/zj-remove-write-config.yml b/changelogs/unreleased/zj-remove-write-config.yml
deleted file mode 100644
index 371d2bd70..000000000
--- a/changelogs/unreleased/zj-remove-write-config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove RepositoryService WriteConfig
-merge_request: 1558
-author:
-type: other
diff --git a/ruby/proto/gitaly/version.rb b/ruby/proto/gitaly/version.rb
index 156e1ae1c..4f9c7ad09 100644
--- a/ruby/proto/gitaly/version.rb
+++ b/ruby/proto/gitaly/version.rb
@@ -1,4 +1,4 @@
# This file was auto-generated by _support/release
module Gitaly
- VERSION = '1.69.0'
+ VERSION = 'v1.70.0'
end