Merge branch 'master' into release-1.12

This commit is contained in:
zacharysarah
2018-10-17 19:10:16 -07:00
558 changed files with 71868 additions and 2594 deletions
@@ -440,7 +440,7 @@ the quantity `10500m` would be written as `10.5` in decimal notation. The metri
will return whole numbers without a suffix when possible, and will generally return
quantities in milli-units otherwise. This means you might see your metric value fluctuate
between `1` and `1500m`, or `1` and `1.5` when written in decimal notation. See the
[glossary entry on quantities](/docs/reference/glossary/quantity.md) for more information.
[glossary entry on quantities](/docs/reference/glossary?core-object=true#term-quantity) for more information.
## Appendix: Other possible scenarios
@@ -458,4 +458,4 @@ $ kubectl create -f https://k8s.io/examples/application/hpa/php-apache.yaml
horizontalpodautoscaler.autoscaling/php-apache created
```
{{% /capture %}}
{{% /capture %}}