From 47e51c8b2b16d94264e2b12ddb01842d3d6a24a6 Mon Sep 17 00:00:00 2001 From: yuxiaobo Date: Thu, 10 Oct 2019 17:47:30 +0800 Subject: [PATCH] Correct spelling mistakes Signed-off-by: yuxiaobo --- CHANGELOG.md | 2 +- scrape/scrape_test.go | 8 ++++---- tsdb/chunkenc/xor.go | 2 +- tsdb/db_test.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb90cebd3..4d3f275a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -128,7 +128,7 @@ and the memory is available to the kernel when it needs it. * [BUGFIX] Check if label value is valid when unmarshaling external labels from YAML. #5316 * [BUGFIX] Promparse: sort all labels when parsing. #5372 * [BUGFIX] Reload rules: copy state on both name and labels. #5368 -* [BUGFIX] Exponentation operator to drop metric name in result of operation. #5329 +* [BUGFIX] Exponentiation operator to drop metric name in result of operation. #5329 * [BUGFIX] Config: resolve more file paths. #5284 * [BUGFIX] Promtool: resolve relative paths in alert test files. #5336 * [BUGFIX] Set TLSHandshakeTimeout in HTTP transport. common#179 diff --git a/scrape/scrape_test.go b/scrape/scrape_test.go index 2e2141761..b43b36cbc 100644 --- a/scrape/scrape_test.go +++ b/scrape/scrape_test.go @@ -550,12 +550,12 @@ func TestScrapeLoopRun(t *testing.T) { select { case <-signal: case <-time.After(5 * time.Second): - t.Fatalf("Cancelation during initial offset failed") + t.Fatalf("Cancellation during initial offset failed") case err := <-errc: t.Fatalf("Unexpected error: %s", err) } - // The provided timeout must cause cancelation of the context passed down to the + // The provided timeout must cause cancellation of the context passed down to the // scraper. The scraper has to respect the context. scraper.offsetDur = 0 @@ -607,7 +607,7 @@ func TestScrapeLoopRun(t *testing.T) { case err := <-errc: t.Fatalf("Unexpected error: %s", err) case <-time.After(3 * time.Second): - t.Fatalf("Loop did not terminate on context cancelation") + t.Fatalf("Loop did not terminate on context cancellation") } } @@ -1469,7 +1469,7 @@ func TestTargetScrapeScrapeCancel(t *testing.T) { if err == nil { errc <- errors.New("Expected error but got nil") } else if ctx.Err() != context.Canceled { - errc <- errors.Errorf("Expected context cancelation error but got: %s", ctx.Err()) + errc <- errors.Errorf("Expected context cancellation error but got: %s", ctx.Err()) } close(errc) }() diff --git a/tsdb/chunkenc/xor.go b/tsdb/chunkenc/xor.go index ca20309f6..ce6e0a951 100644 --- a/tsdb/chunkenc/xor.go +++ b/tsdb/chunkenc/xor.go @@ -14,7 +14,7 @@ // The code in this file was largely written by Damian Gryski as part of // https://github.com/dgryski/go-tsz and published under the license below. // It was modified to accommodate reading from byte slices without modifying -// the underlying bytes, which would panic when reading from mmaped +// the underlying bytes, which would panic when reading from mmap'd // read-only byte slices. // Copyright (c) 2015,2016 Damian Gryski diff --git a/tsdb/db_test.go b/tsdb/db_test.go index 049192d33..e1a3f4afd 100644 --- a/tsdb/db_test.go +++ b/tsdb/db_test.go @@ -2271,7 +2271,7 @@ func TestDBReadOnly(t *testing.T) { err error ) - // Boostrap the db. + // Bootstrap the db. { dbDir, err = ioutil.TempDir("", "test") testutil.Ok(t, err) @@ -2370,7 +2370,7 @@ func TestDBReadOnly_FlushWAL(t *testing.T) { maxt int ) - // Boostrap the db. + // Bootstrap the db. { dbDir, err = ioutil.TempDir("", "test") testutil.Ok(t, err)