Merge remote-tracking branch 'dev/master'

25 files changed, 39 insertions, 120 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f58985193..c69711522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,44 @@
 # Gitaly changelog
 
+## 42.1.1 (2021-02-12)
+
+### Fixed (7 changes)
+
+- operations: Fix hooks running on secondaries when creating annotated tags. !3022
+- transactions: Optionally use timestamps for deterministic results. !3036
+- repository: Fix regressions in FetchRemote. !3043
+- Make gitaly_ruby_json.log work again. !3052
+- coordinator: Fix outdated repos not getting repljobs with transactions. !3055
+- hook: Stop transactions when post-receive and update hooks fail. !3094
+- Fix premature cgroups cleanup. !3098
+
+### Changed (7 changes)
+
+- Port UserUpdateBranch to Go. !3013
+- Remove Ruby code for on-by-default go_user_delete_{branch,tag} feature flags. !3033
+- Enable feature flag go_user_create_{branch,tag} by default. !3035
+- Enable go implementation of UserFFBranch by default. !3057
+- gitaly-lfs-smudge: Clean up URL building. !3058
+- Intercept RepositoryExists calls in Praefect. !3075
+- ruby: Upgrade to Rugged 1.0. !3076
+
+### Performance (3 changes)
+
+- featureflags: Remove GoUserMergeBranch feature flag. !3049
+- featureflag: Remove GoFetchSourceBranch feature flag. !3050
+- Restrict number of threads for a full repack. !3108
+
+### Added (7 changes)
+
+- Track feature flags used for RPC call. !2971
+- operations: Wire up AllowConflicts handling for Go. !2997
+- git: Add support for options which always get injected. !3028
+- repository: Cleanup stale lockfiles when running housekeeping. !3051
+- repository: Use transactions when writing gitattributes. !3064
+- Configurable default replication factor for virtual storages. !3091
+- hook: Use proper error codes when transactions fail. !3097
+
+
 ## 13.8.4 (2021-02-11)
 
 - No changes.
diff --git a/changelogs/unreleased/avar-go-user-create-branch-and-tag-by-default.yml b/changelogs/unreleased/avar-go-user-create-branch-and-tag-by-default.yml
deleted file mode 100644
index 254ef79e7..000000000
--- a/changelogs/unreleased/avar-go-user-create-branch-and-tag-by-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable feature flag go_user_create_{branch,tag} by default
-merge_request: 3035
-author:
-type: changed
diff --git a/changelogs/unreleased/avar-nuke-ruby-user-create-tag-and-branch.yml b/changelogs/unreleased/avar-nuke-ruby-user-create-tag-and-branch.yml
deleted file mode 100644
index 5f73b80c1..000000000
--- a/changelogs/unreleased/avar-nuke-ruby-user-create-tag-and-branch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove Ruby code for on-by-default go_user_delete_{branch,tag} feature flags
-merge_request: 3033
-author:
-type: changed
diff --git a/changelogs/unreleased/avar-user-update-branch-in-go.yml b/changelogs/unreleased/avar-user-update-branch-in-go.yml
deleted file mode 100644
index c8314970e..000000000
--- a/changelogs/unreleased/avar-user-update-branch-in-go.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Port UserUpdateBranch to Go'
-merge_request: 3013
-author:
-type: changed
diff --git a/changelogs/unreleased/fix-premature-cgroup-cleanup.yml b/changelogs/unreleased/fix-premature-cgroup-cleanup.yml
deleted file mode 100644
index e81ecf8b6..000000000
--- a/changelogs/unreleased/fix-premature-cgroup-cleanup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix premature cgroups cleanup
-merge_request: 3098
-author:
-type: fixed
diff --git a/changelogs/unreleased/go_user_ff_branch_by_default.yml b/changelogs/unreleased/go_user_ff_branch_by_default.yml
deleted file mode 100644
index 551304639..000000000
--- a/changelogs/unreleased/go_user_ff_branch_by_default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable go implementation of UserFFBranch by default
-merge_request: 3057
-author:
-type: changed
diff --git a/changelogs/unreleased/pks-cleanup-housekeeping-merge.yml b/changelogs/unreleased/pks-cleanup-housekeeping-merge.yml
deleted file mode 100644
index 745599f0f..000000000
--- a/changelogs/unreleased/pks-cleanup-housekeeping-merge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'repository: Cleanup stale lockfiles when running housekeeping'
-merge_request: 3051
-author:
-type: added
diff --git a/changelogs/unreleased/pks-deterministic-rpcs.yml b/changelogs/unreleased/pks-deterministic-rpcs.yml
deleted file mode 100644
index 7a1a6a527..000000000
--- a/changelogs/unreleased/pks-deterministic-rpcs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'transactions: Optionally use timestamps for deterministic results'
-merge_request: 3036
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-fetch-remote-fix-pruning.yml b/changelogs/unreleased/pks-fetch-remote-fix-pruning.yml
deleted file mode 100644
index 19d1411ee..000000000
--- a/changelogs/unreleased/pks-fetch-remote-fix-pruning.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'repository: Fix regressions in FetchRemote'
-merge_request: 3043
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-git-inject-global-config.yml b/changelogs/unreleased/pks-git-inject-global-config.yml
deleted file mode 100644
index 3d9d30228..000000000
--- a/changelogs/unreleased/pks-git-inject-global-config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'git: Add support for options which always get injected'
-merge_request: 3028
-author:
-type: added
diff --git a/changelogs/unreleased/pks-go-fetch-source-branch-remove-ff.yml b/changelogs/unreleased/pks-go-fetch-source-branch-remove-ff.yml
deleted file mode 100644
index bf4d64441..000000000
--- a/changelogs/unreleased/pks-go-fetch-source-branch-remove-ff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'featureflag: Remove GoFetchSourceBranch feature flag'
-merge_request: 3050
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-go-user-merge-branch-remove-ff.yml b/changelogs/unreleased/pks-go-user-merge-branch-remove-ff.yml
deleted file mode 100644
index a09f069d5..000000000
--- a/changelogs/unreleased/pks-go-user-merge-branch-remove-ff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'featureflags: Remove GoUserMergeBranch feature flag'
-merge_request: 3049
-author:
-type: performance
diff --git a/changelogs/unreleased/pks-go-user-merge-to-ref-allow-conflicts.yml b/changelogs/unreleased/pks-go-user-merge-to-ref-allow-conflicts.yml
deleted file mode 100644
index 08033751f..000000000
--- a/changelogs/unreleased/pks-go-user-merge-to-ref-allow-conflicts.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'operations: Wire up AllowConflicts handling for Go'
-merge_request: 2997
-author:
-type: added
diff --git a/changelogs/unreleased/pks-hook-reftx-error-code.yml b/changelogs/unreleased/pks-hook-reftx-error-code.yml
deleted file mode 100644
index d20df52c3..000000000
--- a/changelogs/unreleased/pks-hook-reftx-error-code.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'hook: Use proper error codes when transactions fail'
-merge_request: 3097
-author:
-type: added
diff --git a/changelogs/unreleased/pks-hooks-stop-transactions.yml b/changelogs/unreleased/pks-hooks-stop-transactions.yml
deleted file mode 100644
index 6cbf5acd6..000000000
--- a/changelogs/unreleased/pks-hooks-stop-transactions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'hook: Stop transactions when post-receive and update hooks fail'
-merge_request: 3094
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-tx-apply-gitattributes.yml b/changelogs/unreleased/pks-tx-apply-gitattributes.yml
deleted file mode 100644
index 22b4dfe34..000000000
--- a/changelogs/unreleased/pks-tx-apply-gitattributes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'repository: Use transactions when writing gitattributes'
-merge_request: 3064
-author:
-type: added
diff --git a/changelogs/unreleased/pks-tx-coordinator-replication-targets.yml b/changelogs/unreleased/pks-tx-coordinator-replication-targets.yml
deleted file mode 100644
index b8cf8fce6..000000000
--- a/changelogs/unreleased/pks-tx-coordinator-replication-targets.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'coordinator: Fix outdated repos not getting repljobs with transactions'
-merge_request: 3055
-author:
-type: fixed
diff --git a/changelogs/unreleased/pks-user-create-tag-hooks-on-secondaries.yml b/changelogs/unreleased/pks-user-create-tag-hooks-on-secondaries.yml
deleted file mode 100644
index 162d37a82..000000000
--- a/changelogs/unreleased/pks-user-create-tag-hooks-on-secondaries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'operations: Fix hooks running on secondaries when creating annotated tags'
-merge_request: 3022
-author:
-type: fixed
diff --git a/changelogs/unreleased/po-optimize-repack-single-threaded.yml b/changelogs/unreleased/po-optimize-repack-single-threaded.yml
deleted file mode 100644
index 020534daf..000000000
--- a/changelogs/unreleased/po-optimize-repack-single-threaded.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Restrict number of threads for a full repack
-merge_request: 3108
-author:
-type: performance
diff --git a/changelogs/unreleased/ps-track-feature-flags.yml b/changelogs/unreleased/ps-track-feature-flags.yml
deleted file mode 100644
index 3366d6f16..000000000
--- a/changelogs/unreleased/ps-track-feature-flags.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Track feature flags used for RPC call
-merge_request: 2971
-author:
-type: added
diff --git a/changelogs/unreleased/sh-clean-lfs-url-build.yml b/changelogs/unreleased/sh-clean-lfs-url-build.yml
deleted file mode 100644
index 8f4ac1854..000000000
--- a/changelogs/unreleased/sh-clean-lfs-url-build.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'gitaly-lfs-smudge: Clean up URL building'
-merge_request: 3058
-author:
-type: changed
diff --git a/changelogs/unreleased/sh-restore-gitaly-json-logs.yml b/changelogs/unreleased/sh-restore-gitaly-json-logs.yml
deleted file mode 100644
index 2e8e958cc..000000000
--- a/changelogs/unreleased/sh-restore-gitaly-json-logs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make gitaly_ruby_json.log work again
-merge_request: 3052
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-rugged-v1-0.yml b/changelogs/unreleased/sh-rugged-v1-0.yml
deleted file mode 100644
index 335daf1cc..000000000
--- a/changelogs/unreleased/sh-rugged-v1-0.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'ruby: Upgrade to Rugged 1.0'
-merge_request: 3076
-author:
-type: changed
diff --git a/changelogs/unreleased/smh-default-replication-factor.yml b/changelogs/unreleased/smh-default-replication-factor.yml
deleted file mode 100644
index c45447e6c..000000000
--- a/changelogs/unreleased/smh-default-replication-factor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Configurable default replication factor for virtual storages
-merge_request: 3091
-author:
-type: added
diff --git a/changelogs/unreleased/smh-intercept-create-repository.yml b/changelogs/unreleased/smh-intercept-create-repository.yml
deleted file mode 100644
index 81db72ac7..000000000
--- a/changelogs/unreleased/smh-intercept-create-repository.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Intercept RepositoryExists calls in Praefect
-merge_request: 3075
-author:
-type: changed