Backport PR#2720 for owls-93995 to release 3.3 #2743
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…espaces, plus fix NPE Conflicts: integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesEvents.java operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java operator/src/main/java/oracle/kubernetes/operator/helpers/EventHelper.java operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java
Conflicts: operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java
Conflicts: operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupport.java
Conflicts: operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java
robertpatrick
approved these changes
Jan 27, 2022
rjeberhard
approved these changes
Feb 2, 2022
rjeberhard
pushed a commit
to rjeberhard/weblogic-kubernetes-operator
that referenced
this pull request
Jun 7, 2023
* Backport PR#2720 for owls-93995 to release 3.3
rjeberhard
pushed a commit
to rjeberhard/weblogic-kubernetes-operator
that referenced
this pull request
Jun 7, 2023
* Backport PR#2720 for owls-93995 to release 3.3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Back port the fix for owls-93995 in #2720 to release/3.3 branch.
Jenkins integration test run results:
release/3.3 branch (33 failures): https://build.weblogick8s.org:8443/job/weblogic-kubernetes-operator-kind-new/8268
this branch (31 failures): https://build.weblogick8s.org:8443/job/weblogic-kubernetes-operator-kind-new/8269