Remove nolint and update misspell to ignore cancelled

schafle · May 29, 2020 · 5d9472b · 5d9472b
1 parent d917dd7
commit 5d9472b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -26,7 +26,7 @@ issues:
 linters-settings:
   misspell:
     locale: US
-    #ignore-words:
-    #  - someword
+    ignore-words:
+      - cancelled
   goimports:
     local-prefixes: go.opentelemetry.io
diff --git a/exporters/otlp/options.go b/exporters/otlp/options.go
@@ -35,9 +35,6 @@ const (
 	// Note: MaxAttempts > 5 are treated as 5. See
 	// https://github.com/grpc/proposal/blob/master/A6-client-retries.md#validation-of-retrypolicy
 	// for more details.
-	//
-	// The following is to ensure CANCELLED is not corrected to CANCELED.
-	// nolint
 	DefaultGRPCServiceConfig = `{
 	"methodConfig":[{
 		"name":[