mirror of
https://github.com/zalando/postgres-operator.git
synced 2026-10-02 23:11:48 +02:00
resolve conflict
This commit is contained in:
+9
-1
@@ -323,12 +323,20 @@ func testNil(values ...*int32) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// Convert int to IntOrString type
|
||||
// ToIntStr converts int to IntOrString type
|
||||
func ToIntStr(val int) *intstr.IntOrString {
|
||||
b := intstr.FromInt(val)
|
||||
return &b
|
||||
}
|
||||
|
||||
// Bool2Int converts bool to int
|
||||
func Bool2Int(flag bool) int {
|
||||
if flag {
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// MaxInt32 : Return maximum of two integers provided via pointers. If one value
|
||||
// is not defined, return the other one. If both are not defined, result is also
|
||||
// undefined, caller needs to check for that.
|
||||
|
||||
Reference in New Issue
Block a user