Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public boolean isLastAttempt() {
failedMessage = " due to conflict";
log.info(
"ErrorStatusUpdateControl.patchStatus of {} failed due to a conflict, but the next"
+ " reconiliation is imminent.",
+ " reconciliation is imminent.",
ResourceID.fromResource(originalResource));
} else {
exceptionLevel = Level.WARN;
Expand Down Expand Up @@ -503,7 +503,6 @@ public R patchStatus(R resource, R originalResource) {
}
}

@SuppressWarnings("unchecked")
private R editStatus(R resource, R originalResource) {
String resourceVersion = resource.getMetadata().getResourceVersion();
// the cached resource should not be changed in any circumstances
Expand Down