summary refs log tree commit diff
path: root/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-04 18:01:08 +0000
committerGitHub <noreply@github.com>2021-11-04 18:01:08 +0000
commit7482ab623ef7f5d9134bbb575246f4249b035f3b (patch)
treebabe6ae138e39bf9b44c0ce75d4970834affbf2a /nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
parenta8cd6b12f4757692b5baf07c043a354e1b3c146c (diff)
parent164173d0fc914ec5f70b67cf1c8b2f03142cb7fc (diff)
downloadnixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.tar
nixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.tar.gz
nixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.tar.bz2
nixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.tar.lz
nixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.tar.xz
nixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.tar.zst
nixpkgs-7482ab623ef7f5d9134bbb575246f4249b035f3b.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual/from_md/release-notes/rl-2111.section.xml')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 39b17835482..121d9e4ad4b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1748,6 +1748,14 @@ Superuser created successfully.
       </listitem>
       <listitem>
         <para>
+          A new option
+          <literal>services.prometheus.enableReload</literal> has been
+          added which can be enabled to reload the prometheus service
+          when its config file changes instead of restarting.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Dokuwiki now supports caddy! However
         </para>
         <itemizedlist spacing="compact">