Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit c5dc61c62d - Show all commits

View File

@ -926,8 +926,8 @@ var (
// to enable a public-OK metrics endpoint without having to worry about ALSO exposing // to enable a public-OK metrics endpoint without having to worry about ALSO exposing
// other profiling behavior or information. // other profiling behavior or information.
MetricsHTTPFlag = &cli.StringFlag{ MetricsHTTPFlag = &cli.StringFlag{
Name: "metrics.addr", Name: "metrics.addr",
Usage: `Enable stand-alone metrics HTTP server listening interface.`, Usage: `Enable stand-alone metrics HTTP server listening interface.`,
Category: flags.MetricsCategory, Category: flags.MetricsCategory,
} }
MetricsPortFlag = &cli.IntFlag{ MetricsPortFlag = &cli.IntFlag{