Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a few incorrect typos #3020

Merged
merged 2 commits into from
May 21, 2021
Merged

Fix a few incorrect typos #3020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3abdd84
fix a few incorrect typo
kjinan May 20, 2021
f3a7c87
Merge branch 'master' into master
jpkrohling May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GOVERNANCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Two other maintainers need to second the nomination. If no one objects in 5 work
We do not expect anyone to make a permanent commitment to be a Jaeger maintainer forever. After all, circumstances change,
people get new jobs, new interests, and may not be able to continue contributing to the project. At the same time, we need
to keep the list of maintainers current in order to have effective governance. People may be removed from the current list
of maintaners via one of the following ways:
of maintainers via one of the following ways:
* They can resign
* If they stop contributing to the project for a period of 6 months or more
* By a 2/3 majority vote by maintainers
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/flags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestQueryOptionsPortAllocationFromFlags(t *testing.T) {
expectedGRPCHostPort: ports.PortToHostPort(ports.QueryGRPC), // fallback in viper
},
{
// If any one host-port is specified, and TLS is diabled, fallback to ports defined in viper
// If any one host-port is specified, and TLS is disabled, fallback to ports defined in viper
name: "Atleast one dedicated host-port is specified, both GRPC and HTTP TLS disabled",
flagsArray: []string{
"--query.http-server.host-port=127.0.0.1:8081",
Expand Down
2 changes: 1 addition & 1 deletion model/converter/thrift/jaeger/from_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/jaegertracing/jaeger/thrift-gen/jaeger"
)

// FromDomain takes an arrya of model.Span and returns
// FromDomain takes an array of model.Span and returns
// an array of jaeger.Span. If errors are found during
// conversion of tags, then error tags are appended.
func FromDomain(spans []*model.Span) []*jaeger.Span {
Expand Down
2 changes: 1 addition & 1 deletion model/proto/metrics/otelmetric.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ message Metric {
// https://github.com/open-telemetry/opentelemetry-specification/issues/617

// Data determines the aggregation type (if any) of the metric, what is the
// reported value type for the data points, as well as the relatationship to
// reported value type for the data points, as well as the relationship to
// the time interval over which they are reported.
oneof data {
// IntGauge and IntSum are deprecated and will be removed soon.
Expand Down