Herron has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404479 )
Change subject: Revert "puppet.conf: replace configtimeout" ...................................................................... Revert "puppet.conf: replace configtimeout" This reverts commit 557e2807734cf93121c44aa5fcadaecfc0febdce. Change-Id: Ibcd05b1d6091ebe94aa5a58de5bafded2f0ed6bf --- M modules/base/templates/puppet.conf.d/10-main.conf.erb 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Herron: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/base/templates/puppet.conf.d/10-main.conf.erb b/modules/base/templates/puppet.conf.d/10-main.conf.erb index 6a62c3e..ca8d341 100644 --- a/modules/base/templates/puppet.conf.d/10-main.conf.erb +++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb @@ -21,8 +21,7 @@ <% if @certname %>certname = <%= @certname %><% end %> <% if @dns_alt_names %>dns_alt_names = <%= @dns_alt_names %><% end %> daemonize = false -http_connect_timeout = 60 -http_read_timeout = 960 +configtimeout = 960 usecacheonfailure = false splay = true pluginsync = true -- To view, visit https://gerrit.wikimedia.org/r/404479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcd05b1d6091ebe94aa5a58de5bafded2f0ed6bf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Herron <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Herron <[email protected]> Gerrit-Reviewer: Jcrespo <[email protected]> Gerrit-Reviewer: Marostegui <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
