9841cf11a1
The wrong json package was used, resulting in patches being unmarshaled
with numbers as float64 rather than int64.
This in turn confused HasConflicts() which expects numeric types to match.
The end result was false positives of meaningful conflicts, such as:
```
there is a meaningful conflict (firstResourceVersion: "8517",
currentResourceVersion: "8519"):
diff1={"metadata":{"resourceVersion":"8519"},"spec":{"replicas":0},"status":{"conditions":null,"fullyLabeledReplicas":null,"replicas":0}}
, diff2={"spec":{"replicas":0}}
```
Kubernetes-commit: 1ab6a33db486adc060e1b63eecbdc06aabdde1f6
|
||
|---|---|---|
| .. | ||
| negotiation | ||
| responsewriters | ||
| BUILD | ||
| discovery.go | ||
| doc.go | ||
| namer.go | ||
| patch.go | ||
| proxy.go | ||
| rest.go | ||
| rest_test.go | ||
| watch.go | ||