From edf170d03b7656ebf5e1237e6e29e2932eb1660c Mon Sep 17 00:00:00 2001 From: Nguyen Quang Huy Date: Mon, 25 Feb 2019 17:04:42 +0700 Subject: [PATCH] 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 --- CHANGELOG.md | 2 +- api/v1/api_test.go | 2 +- cli/test_routing_test.go | 2 +- ui/app/CONTRIBUTING.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6da3344e..f4a56945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 grouping by all labels (#1588) * [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) * [ENHANCEMENT] Add support for --log.format (#1658) * [ENHANCEMENT] Add CORS support to API v2 (#1667) diff --git a/api/v1/api_test.go b/api/v1/api_test.go index b83ea007..1fba64e9 100644 --- a/api/v1/api_test.go +++ b/api/v1/api_test.go @@ -51,7 +51,7 @@ func newFakeAlerts(alerts []*types.Alert, withErr bool) *fakeAlerts { fps: fps, } if withErr { - f.err = errors.New("Error occured") + f.err = errors.New("error occurred") } return f } diff --git a/cli/test_routing_test.go b/cli/test_routing_test.go index 4046ef47..9c83211f 100644 --- a/cli/test_routing_test.go +++ b/cli/test_routing_test.go @@ -36,7 +36,7 @@ func checkResolvedReceivers(mainRoute *dispatch.Route, ls client.LabelSet, expec return err } 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 } diff --git a/ui/app/CONTRIBUTING.md b/ui/app/CONTRIBUTING.md index 8039e2bd..195d03c0 100644 --- a/ui/app/CONTRIBUTING.md +++ b/ui/app/CONTRIBUTING.md @@ -61,7 +61,7 @@ Your app should be available at `http://localhost:`. Navigate to `src/Main.elm`. Any changes to the file system are detected automatically, triggering a recompile of the project. -## Commiting changes +## Committing changes Before you commit changes, please run `make build-all` on the root level Makefile. Please include `asset/*_vfsdata.go` in your commit.