fix merge conflicts
Showing
- .changelog/13493.txt 3 additions, 0 deletions.changelog/13493.txt
- .changelog/14034.txt 3 additions, 0 deletions.changelog/14034.txt
- .changelog/14119.txt 3 additions, 0 deletions.changelog/14119.txt
- .changelog/14149.txt 3 additions, 0 deletions.changelog/14149.txt
- .changelog/14161.txt 3 additions, 0 deletions.changelog/14161.txt
- .changelog/14162.txt 5 additions, 0 deletions.changelog/14162.txt
- .changelog/14178.txt 4 additions, 0 deletions.changelog/14178.txt
- .changelog/14233.txt 3 additions, 0 deletions.changelog/14233.txt
- .changelog/14269.txt 3 additions, 0 deletions.changelog/14269.txt
- .circleci/config.yml 28 additions, 28 deletions.circleci/config.yml
- .github/workflows/build.yml 2 additions, 2 deletions.github/workflows/build.yml
- CHANGELOG.md 96 additions, 45 deletionsCHANGELOG.md
- Dockerfile 12 additions, 9 deletionsDockerfile
- agent/config/builder.go 4 additions, 4 deletionsagent/config/builder.go
- agent/config/config.go 1 addition, 0 deletionsagent/config/config.go
- agent/config/runtime_test.go 95 additions, 8 deletionsagent/config/runtime_test.go
- agent/config/testdata/TestRuntimeConfig_Sanitize.golden 7 additions, 4 deletionsagent/config/testdata/TestRuntimeConfig_Sanitize.golden
- agent/config/testdata/full-config.hcl 1 addition, 0 deletionsagent/config/testdata/full-config.hcl
- agent/config/testdata/full-config.json 2 additions, 1 deletionagent/config/testdata/full-config.json
- agent/connect/sni_test.go 28 additions, 5 deletionsagent/connect/sni_test.go
Please register or sign in to comment