Compare commits

...

4 Commits

Author SHA1 Message Date
Kemal Akkoyun 082c0a2fdb
Merge pull request #1084 from prometheus/beorn7/release
Merge commit tagged as v1.12.2 into the release branch
2022-07-12 07:58:21 +02:00
beorn7 f358b48e57 Merge commit 'e203144f43306c1f344fbc548fd02c4b79962e30' into beorn7/release 2022-07-07 18:42:59 +02:00
Kemal Akkoyun e203144f43 Merge branch 'release-1.12' of github.com:prometheus/client_golang into release-1.12 2022-05-13 12:05:14 +02:00
Kemal Akkoyun a27b6d74f6 Fix conflicts
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
2022-05-13 10:59:26 +02:00
1 changed files with 0 additions and 7 deletions

View File

@ -38,15 +38,8 @@ func main() {
log.Fatal("requires Go version (e.g. go1.17) as an argument")
}
toolVersion := runtime.Version()
<<<<<<< HEAD
if majorVersion := toolVersion[:strings.LastIndexByte(toolVersion, '.')]; majorVersion != os.Args[1] {
log.Fatalf("using Go version %q but expected Go version %q", majorVersion, os.Args[1])
=======
mtv := majorVersion(toolVersion)
mv := majorVersion(os.Args[1])
if mtv != mv {
log.Fatalf("using Go version %q but expected Go version %q", mtv, mv)
>>>>>>> f251146 (prometheus: Fix convention violating names for generated collector metrics (#1048))
}
version, err := parseVersion(mv)
if err != nil {