diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-11 16:11:09 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-11 16:11:09 +0200 |
| commit | bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5 (patch) | |
| tree | f92e0da70d6bb01855f31cede6b8c9b138bd488a /nixos/doc/manual | |
| parent | b7e408dd17f6868ff5d3f50d4b44eaee067412cc (diff) | |
| parent | 15ddd8316a81c32b55b318ea69c97505d27e793b (diff) | |
| download | nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.gz nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.bz2 nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.lz nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.xz nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.tar.zst nixpkgs-bcda9c8cfc7b1522f21b6ea051dae647e4e69bf5.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 1 |
2 files changed, 7 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 42441dcfc1b..73587f8396b 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 @@ -22,6 +22,12 @@ </listitem> <listitem> <para> + kOps now defaults to 1.21.0, which uses containerd as the + default runtime. + </para> + </listitem> + <listitem> + <para> <literal>python3</literal> now defaults to Python 3.9, updated from Python 3.8. </para> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 3a734f88ffc..89ad4790554 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -7,6 +7,7 @@ In addition to numerous new and upgraded packages, this release has the followin ## Highlights {#sec-release-21.11-highlights} - PHP now defaults to PHP 8.0, updated from 7.4. +- kOps now defaults to 1.21.0, which uses containerd as the default runtime. - `python3` now defaults to Python 3.9, updated from Python 3.8. |