From d892abc3536f64dd2529d1c3b497e2800556751b Mon Sep 17 00:00:00 2001 From: AdamDang Date: Tue, 17 Apr 2018 03:21:25 +0800 Subject: [PATCH] Typo fix in conversion.md (#985) * Typo fix in conversion.md Kubernetes uses it's own->Kubernetes uses its own * Update glide.yaml --- docs/conversion.md | 4 ++-- glide.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conversion.md b/docs/conversion.md index 7d156530..a1919b7b 100644 --- a/docs/conversion.md +++ b/docs/conversion.md @@ -57,7 +57,7 @@ __Glossary:__ | labels | ✓ | ✓ | ✓ | Metadata.Annotations | | | links | x | x | x | | All containers in the same pod are accessible in Kubernetes | | logging | x | x | x | | Kubernetes has built-in logging support at the node-level | -| network_mode | x | x | x | | Kubernetes uses it's own cluster networking | +| network_mode | x | x | x | | Kubernetes uses its own cluster networking | | networks | x | x | x | | See `networks` key | | networks: aliases | x | x | x | | See `networks` key | | networks: addresses | x | x | x | | See `networks` key | @@ -68,7 +68,7 @@ __Glossary:__ | secrets | - | - | n | | | | secrets: short-syntax | - | - | n | | | | secrets: long-syntax | - | - | n | | | -| security_opt | x | x | x | | Kubernetes uses it's own container naming scheme | +| security_opt | x | x | x | | Kubernetes uses its own container naming scheme | | stop_grace_period | ✓ | ✓ | ✓ | Pod.Spec.TerminationGracePeriodSeconds | | | stop_signal | x | x | x | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/30051 | | sysctls | n | n | n | | | diff --git a/glide.yaml b/glide.yaml index fdab62f0..04ed1258 100644 --- a/glide.yaml +++ b/glide.yaml @@ -77,6 +77,6 @@ import: # libcompose and OpenShift depends on different Docker version, # this makes sure that we are using version that is compatible with both. -# Glide will show WARN about conflicting rev (it this case it is OK) +# Glide will show WARN about conflicting rev (in this case it is OK) - package: github.com/docker/docker version: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff