DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bad merges

Browse source
This commit is contained in:
Max Laverse 2017-08-25 11:27:01 +02:00
parent 9049b9308e
commit 39de6bd9d7
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controllers/nginx/configuration.md
View file

@ -488,7 +488,6 @@ The following table shows the options, the default value and a description.
|keep-alive|"75"| |keep-alive|"75"|
|log-format-stream|[$time_local] $protocol $status $bytes_sent $bytes_received $session_time| |log-format-stream|[$time_local] $protocol $status $bytes_sent $bytes_received $session_time|
|log-format-upstream|[$the_real_ip] - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" $request_length $request_time [$proxy_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status| |log-format-upstream|[$the_real_ip] - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" $request_length $request_time [$proxy_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status|
|access-format-stream|[$time_local] $protocol $status $bytes_sent $bytes_received $session_time|
|map-hash-bucket-size|"64"| |map-hash-bucket-size|"64"|
|max-worker-connections|"16384"| |max-worker-connections|"16384"|
|proxy-body-size|same as body-size| |proxy-body-size|same as body-size|