Auto stash before merge of "master" and "master/master"

This commit is contained in:
Manuel de Brito Fontes 2017-10-20 22:38:27 -03:00
parent 004ddbcd2f
commit 6537ff3ebf
7 changed files with 8 additions and 8 deletions

View file

@ -264,7 +264,7 @@ By default NGINX uses `http` to reach the services. Adding the annotation `ingre
### Service Upstream
By default the NGINX ingress controller uses a list of all endpoints (Pod IP/port) in the NGINX upstream configuration. This annotation disables that behavior and instead uses a single upstream in NGINX, the service's Cluster IP and port. This can be desirable for things like zero-downtime deployments as it reduces the need to reload NGINX configuration when Pods come up and down. See issue [#257](https://github.com/kubernetes/ingress/issues/257).
By default the NGINX ingress controller uses a list of all endpoints (Pod IP/port) in the NGINX upstream configuration. This annotation disables that behavior and instead uses a single upstream in NGINX, the service's Cluster IP and port. This can be desirable for things like zero-downtime deployments as it reduces the need to reload NGINX configuration when Pods come up and down. See issue [#257](https://github.com/kubernetes/ingress-nginx/issues/257).
#### Known Issues