diff options
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.xml | 12 |
1 files changed, 7 insertions, 5 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 8504593e768..f88be391879 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 @@ -668,11 +668,6 @@ to use wildcards in the <literal>source</literal> argument. </para> </listitem> - </itemizedlist> - <para> - <<<<<<< HEAD - </para> - <itemizedlist> <listitem> <para> The <literal>openrazer</literal> and @@ -715,6 +710,13 @@ release is also still available. </para> </listitem> + <listitem> + <para> + The <literal>kubernetes</literal> package was upgraded to + 1.22. The <literal>kubernetes.apiserver.kubeletHttps</literal> + option was removed and HTTPS is always used. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> |