RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add signed off to commit (#1766) 

- Fix error string should not be capitalized from [Golang coding convention](https://github.com/golang/go/wiki/CodeReviewComments#error-strings)
- Fix some typos

Signed-off-by: Nguyen Quang Huy <huynq0911@gmail.com>
This commit is contained in:
Nguyen Quang Huy 2019-02-25 17:04:42 +07:00 committed by stuart nelson
parent 57c4ff10ab
commit edf170d03b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -26,7 +26,7 @@ deprecated. API v1 will be removed with Alertmanager release v0.18.0.
* [FEATURE] Add support for images and links in the PagerDuty notification config (#1559) * [FEATURE] Add support for images and links in the PagerDuty notification config (#1559)
* [FEATURE] Add support for grouping by all labels (#1588) * [FEATURE] Add support for grouping by all labels (#1588)
* [FEATURE] [amtool] Add timeout support to amtool commands (#1471) * [FEATURE] [amtool] Add timeout support to amtool commands (#1471)
* [FEATURE] [amtool] Added `config routes` tools for vizualization and testing routes (#1511) * [FEATURE] [amtool] Added `config routes` tools for visualization and testing routes (#1511)
* [FEATURE] [amtool] Support adding alerts using amtool (#1461) * [FEATURE] [amtool] Support adding alerts using amtool (#1461)
* [ENHANCEMENT] Add support for --log.format (#1658) * [ENHANCEMENT] Add support for --log.format (#1658)
* [ENHANCEMENT] Add CORS support to API v2 (#1667) * [ENHANCEMENT] Add CORS support to API v2 (#1667)

2
api/v1/api_test.go
View File

@ -51,7 +51,7 @@ func newFakeAlerts(alerts []*types.Alert, withErr bool) *fakeAlerts {
fps: fps, fps: fps,
} }
if withErr { if withErr {
f.err = errors.New("Error occured") f.err = errors.New("error occurred")
} }
return f return f
} }

2
cli/test_routing_test.go
View File

@ -36,7 +36,7 @@ func checkResolvedReceivers(mainRoute *dispatch.Route, ls client.LabelSet, expec
return err return err
} }
if !reflect.DeepEqual(expectedReceivers, resolvedReceivers) { if !reflect.DeepEqual(expectedReceivers, resolvedReceivers) {
return fmt.Errorf("Unexpected routing result want: `%s`, got: `%s`", strings.Join(expectedReceivers, ","), strings.Join(resolvedReceivers, ",")) return fmt.Errorf("unexpected routing result want: `%s`, got: `%s`", strings.Join(expectedReceivers, ","), strings.Join(resolvedReceivers, ","))
} }
return nil return nil
} }

2
ui/app/CONTRIBUTING.md
View File

@ -61,7 +61,7 @@ Your app should be available at `http://localhost:<port>`. Navigate to
`src/Main.elm`. Any changes to the file system are detected automatically, `src/Main.elm`. Any changes to the file system are detected automatically,
triggering a recompile of the project. triggering a recompile of the project.
## Commiting changes ## Committing changes
Before you commit changes, please run `make build-all` on the root level Before you commit changes, please run `make build-all` on the root level
Makefile. Please include `asset/*_vfsdata.go` in your commit. Makefile. Please include `asset/*_vfsdata.go` in your commit.