Merge pull request #9028 from hashicorp/merge/release/1.8.5

changelog: update formatting from 1.8.5 release
hashicorp · Oct 26, 2020 · 150ebb2 · 150ebb2
2 parents bc6fcfa + 4fdc698
commit 150ebb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.changelog/8774.txt b/.changelog/8774.txt
@@ -1,4 +1,3 @@
 ```release-note:improvement
-api: The `v1/connect/ca/roots` endpoint now accepts a `pem=true` query parameter and will return a PEM encoded certificate chain of
-     all the certificates that would normally be in the JSON version of the response.
-```
+api: The `v1/connect/ca/roots` endpoint now accepts a `pem=true` query parameter and will return a PEM encoded certificate chain of all the certificates that would normally be in the JSON version of the response.
+```
diff --git a/.changelog/9024.txt b/.changelog/9024.txt
@@ -1,3 +1,3 @@
 ```release-note:security
-Fix Consul Enterprise Namespace Config Entry Replication DoS. Previously an operator with service:write ACL permissions in a Consul Enterprise cluster could write a malicious config entry that caused infinite raft writes due to issues with the namespace replication logic. [CVE-2020-25201] (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-25201)
+Fix Consul Enterprise Namespace Config Entry Replication DoS. Previously an operator with service:write ACL permissions in a Consul Enterprise cluster could write a malicious config entry that caused infinite raft writes due to issues with the namespace replication logic. [[CVE-2020-25201](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-25201)]
 ```