Merge branch 'v0.11' into amolenk/actorkeyseparator

This commit is contained in:
Aaron Crawfis 2021-01-28 09:32:41 -08:00 committed by GitHub
commit 24372c4644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions

View File

@ -10,9 +10,6 @@ data:
receivers:
zipkin:
endpoint: 0.0.0.0:9411
processors:
queued_retry:
batch:
extensions:
health_check:
pprof:
@ -37,7 +34,6 @@ data:
traces:
receivers: [zipkin]
exporters: [azuremonitor,logging]
processors: [batch, queued_retry]
---
apiVersion: v1
kind: Service