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

Merge pull request #3059 from max8899/patch-1

Browse source 
fix some typos
This commit is contained in:
k8s-ci-robot 2018-09-08 09:12:12 -07:00 committed by GitHub
commit 26ed627560
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/nginx/flags.go
View file

@ -218,7 +218,7 @@ Feature backed by OpenResty Lua libraries. Requires that OCSP stapling is not en
} }
if (*enableSSLChainCompletion || !*dynamicConfigurationEnabled) && *dynamicCertificatesEnabled { if (*enableSSLChainCompletion || !*dynamicConfigurationEnabled) && *dynamicCertificatesEnabled {
return false, nil, fmt.Errorf(`SSL certificate chain completion cannot be enabled and dynamic configration cannot be disabled when return false, nil, fmt.Errorf(`SSL certificate chain completion cannot be enabled and dynamic configuration cannot be disabled when
dynamic certificates functionality is enabled. Please check the flags --enable-ssl-chain-completion and --enable-dynamic-configuration`) dynamic certificates functionality is enabled. Please check the flags --enable-ssl-chain-completion and --enable-dynamic-configuration`)
} }

2
rootfs/etc/nginx/lua/monitor.lua
View file

@ -68,7 +68,7 @@ end
function _M.call() function _M.call()
if #metrics_batch >= MAX_BATCH_SIZE then if #metrics_batch >= MAX_BATCH_SIZE then
ngx.log(ngx.WARN, "omiting metrics for the request, current batch is full") ngx.log(ngx.WARN, "omitting metrics for the request, current batch is full")
return return
end end