Daniel Nephin 374072d1ee Merge pull request #10527 from hashicorp/rename-main-branch ... Update references to the main branch Conflicts: .github/CONTRIBUTING.md website/content/docs/upgrading/instructions/upgrade-to-1-10-x.mdx The website conflicts seems like it some of the changes on main didn't make it into the 1.10.x branch, but the content is relevant for 1.10 so I took the changes from main.		2021-06-30 17:58:22 -04:00
..
pipe-bootstrap	Merge pull request #10324 from hashicorp/dnephin/fix-envoy-bootstrap-exec	2021-06-01 17:03:26 +00:00
testdata	Add flag for transparent proxies to dial individual instances (#10329)	2021-06-09 20:39:37 +00:00
bootstrap_config.go	Merge pull request #10527 from hashicorp/rename-main-branch	2021-06-30 17:58:22 -04:00
bootstrap_config_test.go	support env var expansion in envoy statsd urls	2021-03-18 18:57:28 -04:00
bootstrap_tpl.go	Support Incremental xDS mode (#9855)	2021-04-29 18:54:53 +00:00
envoy.go	command: when generating envoy bootstrap configs to stdout do not mix informational logs into the json (#9980)	2021-04-07 14:22:52 -05:00
envoy_oss_test.go	Add DC and NS support for Envoy metrics (#9207)	2020-11-16 16:37:19 -07:00
envoy_test.go	command: when generating envoy bootstrap configs to stdout do not mix informational logs into the json (#9980)	2021-04-07 14:22:52 -05:00
exec_test.go	Merge pull request #10324 from hashicorp/dnephin/fix-envoy-bootstrap-exec	2021-06-01 17:03:26 +00:00
exec_unix.go	Merge pull request #10324 from hashicorp/dnephin/fix-envoy-bootstrap-exec	2021-06-01 17:03:26 +00:00
exec_unsupported.go	cli: avoid passing envoy bootstrap configuration as arguments (#4747)	2018-10-10 16:55:34 +01:00
flags.go	connect: switch the default gateway port from 443 to 8443 (#9116)	2020-11-06 20:47:29 -05:00
flags_test.go	connect: switch the default gateway port from 443 to 8443 (#9116)	2020-11-06 20:47:29 -05:00