Skip to content

Terminology style updates for auth book#27398

Merged
bergerhoffer merged 1 commit intoopenshift:masterfrom
bergerhoffer:term-updates-auth
Dec 3, 2020
Merged

Terminology style updates for auth book#27398
bergerhoffer merged 1 commit intoopenshift:masterfrom
bergerhoffer:term-updates-auth

Conversation

@bergerhoffer
Copy link
Contributor

@bergerhoffer bergerhoffer commented Nov 16, 2020

@bergerhoffer bergerhoffer added this to the Next Release milestone Nov 16, 2020
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 16, 2020
@openshift-docs-preview-bot

The preview will be available shortly at:

Copy link
Contributor

@jboxman jboxman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grab bag of mostly minor observations.

@jboxman jboxman 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 Nov 16, 2020
@bergerhoffer bergerhoffer merged commit 7caa9e0 into openshift:master Dec 3, 2020
@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Dec 3, 2020

/cherrypick enterprise-4.7

@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Dec 3, 2020

/cherrypick enterprise-4.6

@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Dec 3, 2020

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 3, 2020

@bergerhoffer: new pull request created: #27850

Details

In response to this:

/cherrypick enterprise-4.7

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.

@bergerhoffer
Copy link
Contributor Author

bergerhoffer commented Dec 3, 2020

/cherrypick enterprise-4.4

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 3, 2020

@bergerhoffer: #27398 failed to apply on top of branch "enterprise-4.5":

Applying: Terminology style updates for auth book
Using index info to reconstruct a base tree...
M	_topic_map.yml
A	modules/oauth-configuring-token-inactivity-timeout-clients.adoc
A	modules/oauth-configuring-token-inactivity-timeout.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/oauth-configuring-token-inactivity-timeout.adoc deleted in HEAD and modified in Terminology style updates for auth book. Version Terminology style updates for auth book of modules/oauth-configuring-token-inactivity-timeout.adoc left in tree.
CONFLICT (modify/delete): modules/oauth-configuring-token-inactivity-timeout-clients.adoc deleted in HEAD and modified in Terminology style updates for auth book. Version Terminology style updates for auth book of modules/oauth-configuring-token-inactivity-timeout-clients.adoc left in tree.
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Terminology style updates for auth book
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.5

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
Copy link

openshift-cherrypick-robot commented Dec 3, 2020

@bergerhoffer: new pull request created: #27851

Details

In response to this:

/cherrypick enterprise-4.6

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
Copy link

openshift-cherrypick-robot commented Dec 3, 2020

@bergerhoffer: #27398 failed to apply on top of branch "enterprise-4.4":

Applying: Terminology style updates for auth book
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/bound-sa-tokens-configuring.adoc
M	modules/identity-provider-about-basic-authentication.adoc
M	modules/identity-provider-add.adoc
M	modules/identity-provider-config-map.adoc
M	modules/identity-provider-configuring-apache-request-header.adoc
M	modules/identity-provider-default-CR.adoc
M	modules/identity-provider-htpasswd-secret.adoc
M	modules/identity-provider-htpasswd-update-users.adoc
M	modules/identity-provider-ldap-secret.adoc
M	modules/identity-provider-overview.adoc
M	modules/identity-provider-secret.adoc
M	modules/ldap-syncing-activedir.adoc
M	modules/ldap-syncing-augmented-activedir.adoc
M	modules/ldap-syncing-nesting.adoc
M	modules/ldap-syncing-rfc2307-user-defined-error.adoc
M	modules/ldap-syncing-rfc2307-user-defined.adoc
M	modules/ldap-syncing-rfc2307.adoc
M	modules/ldap-syncing-running-all-ldap.adoc
M	modules/ldap-syncing-running-openshift.adoc
M	modules/ldap-syncing-running-subset.adoc
A	modules/oauth-configuring-token-inactivity-timeout-clients.adoc
A	modules/oauth-configuring-token-inactivity-timeout.adoc
M	modules/oauth-troubleshooting-api-events.adoc
M	modules/rbac-creating-cluster-role.adoc
M	modules/rbac-overview.adoc
M	modules/rbac-users.adoc
M	modules/rbac-viewing-cluster-roles.adoc
M	modules/security-context-constraints-creating.adoc
M	modules/security-context-constraints-rbac.adoc
M	modules/service-accounts-as-oauth-clients.adoc
M	modules/service-accounts-granting-roles.adoc
M	modules/service-accounts-using-credentials-externally.adoc
M	modules/user-agent-overview.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/user-agent-overview.adoc
Auto-merging modules/service-accounts-using-credentials-externally.adoc
Auto-merging modules/service-accounts-granting-roles.adoc
Auto-merging modules/service-accounts-as-oauth-clients.adoc
Auto-merging modules/security-context-constraints-rbac.adoc
Auto-merging modules/security-context-constraints-creating.adoc
Auto-merging modules/rbac-viewing-cluster-roles.adoc
Auto-merging modules/rbac-users.adoc
CONFLICT (content): Merge conflict in modules/rbac-users.adoc
Auto-merging modules/rbac-overview.adoc
Auto-merging modules/rbac-creating-cluster-role.adoc
Auto-merging modules/oauth-troubleshooting-api-events.adoc
CONFLICT (modify/delete): modules/oauth-configuring-token-inactivity-timeout.adoc deleted in HEAD and modified in Terminology style updates for auth book. Version Terminology style updates for auth book of modules/oauth-configuring-token-inactivity-timeout.adoc left in tree.
CONFLICT (modify/delete): modules/oauth-configuring-token-inactivity-timeout-clients.adoc deleted in HEAD and modified in Terminology style updates for auth book. Version Terminology style updates for auth book of modules/oauth-configuring-token-inactivity-timeout-clients.adoc left in tree.
Auto-merging modules/ldap-syncing-running-subset.adoc
CONFLICT (content): Merge conflict in modules/ldap-syncing-running-subset.adoc
Auto-merging modules/ldap-syncing-running-openshift.adoc
Auto-merging modules/ldap-syncing-running-all-ldap.adoc
Auto-merging modules/ldap-syncing-rfc2307.adoc
Auto-merging modules/ldap-syncing-rfc2307-user-defined.adoc
Auto-merging modules/ldap-syncing-rfc2307-user-defined-error.adoc
Auto-merging modules/ldap-syncing-nesting.adoc
Auto-merging modules/ldap-syncing-augmented-activedir.adoc
Auto-merging modules/ldap-syncing-activedir.adoc
Auto-merging modules/identity-provider-secret.adoc
Auto-merging modules/identity-provider-overview.adoc
CONFLICT (content): Merge conflict in modules/identity-provider-overview.adoc
Auto-merging modules/identity-provider-ldap-secret.adoc
Auto-merging modules/identity-provider-htpasswd-update-users.adoc
Auto-merging modules/identity-provider-htpasswd-secret.adoc
Auto-merging modules/identity-provider-default-CR.adoc
Auto-merging modules/identity-provider-configuring-apache-request-header.adoc
Auto-merging modules/identity-provider-config-map.adoc
Auto-merging modules/identity-provider-add.adoc
Auto-merging modules/identity-provider-about-basic-authentication.adoc
Auto-merging modules/bound-sa-tokens-configuring.adoc
Auto-merging _topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Terminology style updates for auth book
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.4

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-4.4 branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants