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
..
aead/chacha20	vendor: Update dependencies	2017-07-27 16:11:56 -06:00
alecthomas	Vendor all dependencies (Warning: Huge changeset.)	2017-05-27 13:30:11 -06:00
bifurcation/mint	vendor: Updated quic-go for QUIC 39+ (#1968)	2018-02-16 22:29:53 -07:00
dustin/go-humanize	Vendor all dependencies (Warning: Huge changeset.)	2017-05-27 13:30:11 -06:00
flynn/go-shlex	Vendor all dependencies (Warning: Huge changeset.)	2017-05-27 13:30:11 -06:00
golang/protobuf	vendor: Update dependencies	2017-07-27 16:11:56 -06:00
google/uuid	Create diagnostics package; persist UUID	2018-02-02 19:15:28 -07:00
gorilla/websocket	vendor: Update dependencies	2017-07-27 16:11:56 -06:00
hashicorp	Support nacl compilation	2017-08-29 16:21:26 -06:00
jimstudt/http-authentication/basic	Vendor all dependencies (Warning: Huge changeset.)	2017-05-27 13:30:11 -06:00
klauspost/cpuid	diagnostics: Implemented collection functions and create first metrics	2018-02-08 19:55:44 -07:00
lucas-clemente	vendor: Update quic and lego/acme dependencies	2018-04-18 15:48:08 -06:00
miekg/dns	vendor: Update dependencies	2017-07-27 16:11:56 -06:00
naoina	Vendor all dependencies (Warning: Huge changeset.)	2017-05-27 13:30:11 -06:00
russross/blackfriday	vendor: Update dependencies	2017-07-27 16:11:56 -06:00
xenolf/lego/acmev2	vendor: Update lego to fix error handling bug (closes #2124)	2018-04-19 18:07:12 -06:00