Merge branch 'upstream-master'

ee/ucp/release-notes.md

@@ -219,8 +219,7 @@ Azure Disk when installing UCP with the `--cloud-provider` option.
    * To deploy Pods with Privileged options, users now require a grant with the
    role `Full Control` for all namespaces.
    * The `/api/ucp/config` endpoint now includes default node orchestrator.
-   * Added `cni_mtu` and `cni_ipinip_mtu` settings to UCP config for controlling
-   MTU sizes in Calico.
+   * Added `cni_mtu` setting to UCP config for controlling MTU size in Calico.
    * When a route is not found, interlock now returns a 503 (the expected
      behavior) instead of a 404.
 

install/linux/docker-ce/debian.md

@@ -32,7 +32,7 @@ Raspbian versions:
 - Jessie 8 (LTS) / Raspbian Jessie
 - Wheezy 7.7 (LTS)
 
-Docker CE is supported on both `x86_64` (or `amd64`)  and `armhf` architectures for Jessie and
+Docker CE is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectures for Jessie and
 Stretch.
 
 ### Uninstall old versions
@@ -168,6 +168,7 @@ from the repository.
     <ul class="nav nav-tabs">
       <li class="active"><a data-toggle="tab" data-target="#x86_64_repo">x86_64 / amd64</a></li>
       <li><a data-toggle="tab" data-target="#armhf_repo">armhf</a></li>
+      <li><a data-toggle="tab" data-target="#arm64_repo">arm64</a></li>
     </ul>
     <div class="tab-content">
     <div id="x86_64_repo" class="tab-pane fade in active" markdown="1">
@@ -188,6 +189,15 @@ from the repository.
         sudo tee /etc/apt/sources.list.d/docker.list
     ```
 
+    </div>
+    <div id="arm64_repo" class="tab-pane fade" markdown="1">
+
+    ```bash
+    $ echo "deb [arch=arm64] {{ download-url-base }} \
+         $(lsb_release -cs) stable" | \
+        sudo tee /etc/apt/sources.list.d/docker.list
+    ```
+
     </div>
     </div> <!-- tab-content -->
 
@@ -290,8 +300,8 @@ If you cannot use Docker's repository to install Docker CE, you can download the
 a new file each time you want to upgrade Docker.
 
 1.  Go to `{{ download-url-base }}/dists/`,
-    choose your Debian version, browse to `pool/stable/`, choose either
-    `amd64` or `armhf`, and download the `.deb` file for the Docker CE version you
+    choose your Debian version, browse to `pool/stable/`, choose
+    `amd64`, `armhf`, or `arm64` and download the `.deb` file for the Docker CE version you
     want to install.
 
     > **Note**: To install an **edge**  package, change the word