Merge branch 'master' into staging

This commit is contained in:
Denise 2019-07-15 15:35:56 -07:00 committed by GitHub
commit a58729c6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -81,7 +81,9 @@ $ sudo ros config set rancher.upgrade.url https://foo.bar.com/os/releases.yml
# Example Cloud-config
Here is a total cloud-config example for using RancherOS in air gap environment.
Here is a total cloud-config example for using RancherOS in an air gap environment.
For `system-docker`, see [Configuring Private Docker Registry]({{< baseurl >}}/os/v1.x/en/installation/configuration/airgap-configuration/#configuring-private-docker-registry).
```yaml