Merge pull request #3056 from prometheus/mergemaster
Merge master into dev-2.0
Showing
discovery/README.md
0 → 100644
util/httputil/client_test.go
0 → 100644
util/httputil/testdata/barney.crt
0 → 100644
util/httputil/testdata/server.crt
0 → 100644
util/httputil/testdata/server.key
0 → 100644
util/testutil/roundtrip.go
0 → 100644
此差异已折叠。
web/ui/static/css/targets.css
0 → 100644
web/ui/static/js/targets.js
0 → 100644
想要评论请 注册 或 登录