Skip to content

Conversation

@sheriff-rh
Copy link
Contributor

Link to bug, see c#8:
https://bugzilla.redhat.com/show_bug.cgi?id=1622044

@gpei PTAL
@openshift/team-documentation peer review please!

Thanks!

@sheriff-rh sheriff-rh added peer-review-needed Signifies that the peer review team needs to review this PR branch/enterprise-3.10 branch/enterprise-3.11 labels Jan 30, 2019
@sheriff-rh sheriff-rh added this to the Next Release milestone Jan 30, 2019
@sheriff-rh sheriff-rh self-assigned this Jan 30, 2019
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 30, 2019
@ahardin-rh ahardin-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jan 30, 2019
@ahardin-rh
Copy link
Contributor

Looks good! 👍

@sheriff-rh
Copy link
Contributor Author

QE Ok'ed in c#13 of bug, merging.

@sheriff-rh sheriff-rh merged commit 5228991 into openshift:master Jan 31, 2019
@sheriff-rh
Copy link
Contributor Author

/cherrypick enterprise-3.10

@sheriff-rh
Copy link
Contributor Author

/cherrypick enterprise-3.11

@openshift-cherrypick-robot

@sheriff-rh: new pull request created: #13490

Details

In response to this:

/cherrypick enterprise-3.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@sheriff-rh: #13477 failed to apply on top of branch "enterprise-3.11":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	install_config/master_node_configuration.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/master_node_configuration.adoc
CONFLICT (content): Merge conflict in install_config/master_node_configuration.adoc
Patch failed at 0001 bug 1622044 corrected auditFilePath examples

Details

In response to this:

/cherrypick enterprise-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-3.10 branch/enterprise-3.11 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants