Merge pull request #1925 from go-pg/release/v10.10.5

vmihailenco · web-flow · commit 1a4c16b88156 · 2021-09-04T09:57:00.000+03:00
Release v10.10.5 (release.sh)
diff --git a/extra/pgdebug/go.mod b/extra/pgdebug/go.mod
@@ -4,4 +4,4 @@ go 1.15
 
 replace github.com/go-pg/pg/v10 => ../..
 
-require github.com/go-pg/pg/v10 v10.10.4
+require github.com/go-pg/pg/v10 v10.10.5
diff --git a/extra/pgotel/example/go.mod b/extra/pgotel/example/go.mod
@@ -7,8 +7,8 @@ replace github.com/go-pg/pg/v10 => ../../..
 replace github.com/go-pg/pg/extra/pgotel/v10 => ../
 
 require (
-	github.com/go-pg/pg/extra/pgotel/v10 v10.10.4
-	github.com/go-pg/pg/v10 v10.10.4
+	github.com/go-pg/pg/extra/pgotel/v10 v10.10.5
+	github.com/go-pg/pg/v10 v10.10.5
 	go.opentelemetry.io/otel v1.0.0-RC2
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.0.0-RC2
 	go.opentelemetry.io/otel/sdk v1.0.0-RC2
diff --git a/extra/pgotel/go.mod b/extra/pgotel/go.mod
@@ -5,7 +5,7 @@ go 1.15
 replace github.com/go-pg/pg/v10 => ../..
 
 require (
-	github.com/go-pg/pg/v10 v10.10.4
+	github.com/go-pg/pg/v10 v10.10.5
 	github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
 	go.opentelemetry.io/otel v1.0.0-RC1
 	go.opentelemetry.io/otel/trace v1.0.0-RC1
diff --git a/extra/pgsegment/go.mod b/extra/pgsegment/go.mod
@@ -5,7 +5,7 @@ go 1.15
 replace github.com/go-pg/pg/v10 => ../..
 
 require (
-	github.com/go-pg/pg/v10 v10.10.4
+	github.com/go-pg/pg/v10 v10.10.5
 	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
 	github.com/segmentio/encoding v0.2.17
 )
diff --git a/version.go b/version.go
@@ -2,5 +2,5 @@ package pg
 
 // Version is the current release version.
 func Version() string {
-	return "10.10.4"
+	return "10.10.5"
 }

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ go 1.15`
`4`	`4`
`5`	`5`	`replace github.com/go-pg/pg/v10 => ../..`
`6`	`6`
`7`		`-require github.com/go-pg/pg/v10 v10.10.4`
	`7`	`+require github.com/go-pg/pg/v10 v10.10.5`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.15`
`5`	`5`	`replace github.com/go-pg/pg/v10 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`		`- github.com/go-pg/pg/v10 v10.10.4`
	`8`	`+ github.com/go-pg/pg/v10 v10.10.5`
`9`	`9`	`github.com/klauspost/cpuid/v2 v2.0.6 // indirect`
`10`	`10`	`github.com/segmentio/encoding v0.2.17`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ package pg`
`2`	`2`
`3`	`3`	`// Version is the current release version.`
`4`	`4`	`func Version() string {`
`5`		`- return "10.10.4"`
	`5`	`+ return "10.10.5"`
`6`	`6`	`}`