Merge master into dev-1.22 to keep in sync

Signed-off-by: Ritu Panjwani <panjwaniritu45@gmail.com>
2021-06-11 10:47:20 -07:00
parent d8f4b5c161 1e402f834d
commit 20efd69cd9
58 changed files with 846 additions and 795 deletions
@@ -188,7 +188,7 @@ To install a specific version of containerD specify the version with -ContainerD

 ```powershell
 # Example
-.\Install-Containerd.ps1 -ContainerDVersion v1.4.1
+.\Install-Containerd.ps1 -ContainerDVersion 1.4.1
 ```

 {{< /note >}}