Merge branch 'v1.6' into docs-for-OCI-ObjectStorage-State

This commit is contained in:
greenie-msft 2022-01-19 11:15:33 -08:00 committed by GitHub
commit 78aac7c5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -90,7 +90,7 @@ spec:
Run the sidecar and the Go server:
```bash
dapr run --app-id server --app-protocol grpc --app-port 50051 --config config.yaml -- go run main.go
dapr run --app-id server --app-port 50051 --config config.yaml -- go run main.go
```
Using the Dapr CLI, we're assigning a unique id to the app, `server`, using the `--app-id` flag.

View File

@ -71,7 +71,7 @@ spec:
spec:
containers:
- name: otel-collector
image: otel/opentelemetry-collector-contrib-dev:latest
image: otel/opentelemetry-collector-contrib:0.40.0
command:
- "/otelcontribcol"
- "--config=/conf/otel-collector-config.yaml"