summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-24 14:14:20 +0100
committerGitHub <noreply@github.com>2019-06-24 14:14:20 +0100
commitcf7aef11145254ba3d008b39865146ee21da8ffc (patch)
treea43f34872f48cccbb10044b032cd36003cc85a3b /changelog.d
parentPass config_dir_path and data_dir_path into Config.read_config. (#5522) (diff)
parentchangelog (diff)
downloadsynapse-cf7aef11145254ba3d008b39865146ee21da8ffc.tar.xz
Merge pull request #5516 from matrix-org/rav/acme_key_path
Allow configuration of the path used for ACME account keys.
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5516.feature1
-rw-r--r--changelog.d/5521.feature1
-rw-r--r--changelog.d/5521.misc1
-rw-r--r--changelog.d/5522.feature1
-rw-r--r--changelog.d/5522.misc1
5 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5516.feature b/changelog.d/5516.feature
new file mode 100644
index 0000000000..fdf91c35e4
--- /dev/null
+++ b/changelog.d/5516.feature
@@ -0,0 +1 @@
+Allow configuration of the path used for ACME account keys.
diff --git a/changelog.d/5521.feature b/changelog.d/5521.feature
new file mode 100644
index 0000000000..fdf91c35e4
--- /dev/null
+++ b/changelog.d/5521.feature
@@ -0,0 +1 @@
+Allow configuration of the path used for ACME account keys.
diff --git a/changelog.d/5521.misc b/changelog.d/5521.misc
deleted file mode 100644
index e3a14fdeaf..0000000000
--- a/changelog.d/5521.misc
+++ /dev/null
@@ -1 +0,0 @@
-Factor acme bits out to a separate file.
diff --git a/changelog.d/5522.feature b/changelog.d/5522.feature
new file mode 100644
index 0000000000..fdf91c35e4
--- /dev/null
+++ b/changelog.d/5522.feature
@@ -0,0 +1 @@
+Allow configuration of the path used for ACME account keys.
diff --git a/changelog.d/5522.misc b/changelog.d/5522.misc
deleted file mode 100644
index 17a7be5c99..0000000000
--- a/changelog.d/5522.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pass config_dir_path and data_dir_path into Config.read_config.