diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-02-21 18:06:54 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-02-21 18:06:54 +0300 |
| commit | 383556c04d4c92dc7f0a4272a2d406aa140b28a7 (patch) | |
| tree | 8fd935a7cdf28114f7f3000cb0c131a0d7925e38 | |
| parent | 443e3578520f7fb92f42a96d3fc77b0ad1381820 (diff) | |
| parent | 17daa70be1f1737c4ee6f1bf6ba428ff198ba649 (diff) | |
Merge branch '12-8-stable'
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/jc-add-praefect-client-metric.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/ps-garbage-out-of-sub-cmd.yml | 5 |
4 files changed, 13 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b3c85140..4c9d17612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Gitaly changelog +## 12.8.0 + +- No changes. +### Added (1 change) + +- Add praefect client prometheus interceptor. !1836 + +### Other (1 change) + +- Praefect sub-commands: avoid garbage in logs. !1819 + + ## v1.87.0 #### Added @@ -1 +1 @@ -1.87.0 +12.8.0 diff --git a/changelogs/unreleased/jc-add-praefect-client-metric.yml b/changelogs/unreleased/jc-add-praefect-client-metric.yml deleted file mode 100644 index 74a920190..000000000 --- a/changelogs/unreleased/jc-add-praefect-client-metric.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add praefect client prometheus interceptor -merge_request: 1836 -author: -type: added diff --git a/changelogs/unreleased/ps-garbage-out-of-sub-cmd.yml b/changelogs/unreleased/ps-garbage-out-of-sub-cmd.yml deleted file mode 100644 index 6259dc3d2..000000000 --- a/changelogs/unreleased/ps-garbage-out-of-sub-cmd.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Praefect sub-commands: avoid garbage in logs' -merge_request: 1819 -author: -type: other |