diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-09-14 17:02:04 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-09-14 17:02:04 +0000 |
| commit | e072ded4f45bbf733f9b2ca08b953159eaf56e0d (patch) | |
| tree | 31a87f022bcaf827a8bafa58e580606253dbdf98 | |
| parent | 6b7d701ecbf7d7cac5bda0c87770104960b37f6a (diff) | |
| download | gitlab-ce-e072ded4f45bbf733f9b2ca08b953159eaf56e0d.tar.gz | |
Update CHANGELOG.md for 13.3.6
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/246741-conan-unicorn-bug.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 75eb36cee09..4507a0061af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.3.6 (2020-09-14) + +### Fixed (2 changes) + +- Fixes Auto DevOps deploy script for multiple additional hosts separated by comma and space. !41404 +- Use 'read' method to get request body in Conan to fix uploads when using Unicorn. !41801 + + ## 13.3.5 (2020-09-04) ### Fixed (6 changes) diff --git a/changelogs/unreleased/246741-conan-unicorn-bug.yml b/changelogs/unreleased/246741-conan-unicorn-bug.yml deleted file mode 100644 index 669550c1c81..00000000000 --- a/changelogs/unreleased/246741-conan-unicorn-bug.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use 'read' method to get request body in Conan to fix uploads when using Unicorn -merge_request: 41801 -author: -type: fixed diff --git a/changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml b/changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml deleted file mode 100644 index 6000a9f493d..00000000000 --- a/changelogs/unreleased/fix-bump-ado-image-to-1-0-3.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fixes Auto DevOps deploy script for multiple additional hosts separated by - comma and space -merge_request: 41404 -author: -type: fixed |