From 6bf080393d88534aa658ecaff32ae089bd304772 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 4 Apr 2017 11:42:07 -0700 Subject: Fixing race conditions in the code base (#5966) * Adding initial race detector * Remove setting of config twice * Fixing config file watch and config reload on license save * Fixing config file watch and config reload on license save * Fixing build error * Fixing locking issue * Fixing makefile * Fixing race in config * Fixing race in status unit test * Adding EE race tests * Fixing race in cluster info * Removing code that's isn't needed * Fixing some more races * Fixing govet issue --- vendor/golang.org/x/text/encoding/charmap/maketables.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vendor/golang.org/x/text/encoding/charmap/maketables.go') diff --git a/vendor/golang.org/x/text/encoding/charmap/maketables.go b/vendor/golang.org/x/text/encoding/charmap/maketables.go index a691acb14..f7941701e 100644 --- a/vendor/golang.org/x/text/encoding/charmap/maketables.go +++ b/vendor/golang.org/x/text/encoding/charmap/maketables.go @@ -494,7 +494,7 @@ func main() { if e.comment != "" { printf("//\n// %s\n", e.comment) } - printf("var %s encoding.Encoding = &%s\n\nvar %s = charmap{\nname: %q,\n", + printf("var %s *Charmap = &%s\n\nvar %s = Charmap{\nname: %q,\n", varName, lowerVarName, lowerVarName, e.name) if mibs[e.mib] { log.Fatalf("MIB type %q declared multiple times.", e.mib) @@ -540,7 +540,7 @@ func main() { } printf("},\n}\n") - // Add an estimate of the size of a single charmap{} struct value, which + // Add an estimate of the size of a single Charmap{} struct value, which // includes two 256 elem arrays of 4 bytes and some extra fields, which // align to 3 uint64s on 64-bit architectures. w.Size += 2*4*256 + 3*8 -- cgit v1.2.3-1-g7c22