Matthew Holt b019501b8b Merge branch 'master' into telemetry ... # Conflicts: # caddy/caddymain/run.go # caddyhttp/httpserver/plugin.go # caddytls/client.go		2018-04-20 00:03:57 -06:00
..
cloud.google.com/go/compute/metadata
github.com	Merge branch 'master' into telemetry	2018-04-20 00:03:57 -06:00
go4.org/syncutil/singleflight
golang.org/x
google.golang.org
gopkg.in
manifest	Merge branch 'master' into telemetry	2018-04-20 00:03:57 -06:00