IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14317 from mjtrangoni/fix-misspell-issues

Browse Source 
pkg/*: Fix misspelling issues using locale US
This commit is contained in:
Carl Bergquist 2018-12-05 10:34:28 +01:00 committed by GitHub
commit 3c330c8e4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/components/dynmap/dynmap.go
View File

@ -1,5 +1,5 @@
// uses code from https://github.com/antonholmquist/jason/blob/master/jason.go // uses code from https://github.com/antonholmquist/jason/blob/master/jason.go
// MIT Licence // MIT License
package dynmap package dynmap

2
pkg/components/dynmap/dynmap_test.go
View File

@ -1,5 +1,5 @@
// uses code from https://github.com/antonholmquist/jason/blob/master/jason.go // uses code from https://github.com/antonholmquist/jason/blob/master/jason.go
// MIT Licence // MIT License
package dynmap package dynmap

2
pkg/services/sqlstore/org_test.go
View File

@ -187,7 +187,7 @@ func TestAccountDataAccess(t *testing.T) {
err := DeleteOrg(&m.DeleteOrgCommand{Id: ac2.OrgId}) err := DeleteOrg(&m.DeleteOrgCommand{Id: ac2.OrgId})
So(err, ShouldBeNil) So(err, ShouldBeNil)
// remove frome ac2 from ac1 org // remove ac2 user from ac1 org
remCmd := m.RemoveOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, ShouldDeleteOrphanedUser: true} remCmd := m.RemoveOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, ShouldDeleteOrphanedUser: true}
err = RemoveOrgUser(&remCmd) err = RemoveOrgUser(&remCmd)
So(err, ShouldBeNil) So(err, ShouldBeNil)

2
pkg/tsdb/elasticsearch/response_parser.go
View File

@ -541,7 +541,7 @@ func getErrorFromElasticResponse(response *es.SearchResponse) *tsdb.QueryResult
} else if reason != "" { } else if reason != "" {
result.ErrorString = reason result.ErrorString = reason
} else { } else {
result.ErrorString = "Unkown elasticsearch error response" result.ErrorString = "Unknown elasticsearch error response"
} }
return result return result

2
pkg/tsdb/opentsdb/opentsdb.go
View File

@ -84,7 +84,7 @@ func (e *OpenTsdbExecutor) createRequest(dsInfo *models.DataSource, data OpenTsd
postData, err := json.Marshal(data) postData, err := json.Marshal(data)
if err != nil { if err != nil {
plog.Info("Failed marshalling data", "error", err) plog.Info("Failed marshaling data", "error", err)
return nil, fmt.Errorf("Failed to create request. error: %v", err) return nil, fmt.Errorf("Failed to create request. error: %v", err)
} }