public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-09 08:36:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fes-support

Browse Source
This commit is contained in:
Felix Kunde
2021-08-09 16:24:05 +02:00
parent 70df4515bc 66620d5049
commit 2fadb740fa
5 changed files with 228 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/acid.zalan.do/v1/marshal.go
+1 -1
View File
@@ -81,7 +81,7 @@ func (ps *PostgresStatus) UnmarshalJSON(data []byte) error {
if err != nil {
metaErr := json.Unmarshal(data, &status)
if metaErr != nil {
return fmt.Errorf("Could not parse status: %v; err %v", string(data), metaErr)
return fmt.Errorf("could not parse status: %v; err %v", string(data), metaErr)
}
tmp.PostgresClusterStatus = status
}