Skip to content

Conversation

@rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Feb 26, 2021

Update oc get cronjob example
https://issues.redhat.com/browse/RHDEVDOCS-2730
[enterprise-4.6]
[enterprise-4.7]
[enterprise-4.8]

Update oc get cronjob example
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 26, 2021
@netlify
Copy link

netlify bot commented Feb 26, 2021

Deploy preview for osdocs ready!

Built with commit 65a71eb

https://deploy-preview-29896--osdocs.netlify.app

Copy link

@anpingli anpingli left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2021
@ahardin-rh ahardin-rh added this to the Next Release milestone Feb 26, 2021
@ahardin-rh
Copy link
Contributor

LGTM!

@ahardin-rh ahardin-rh merged commit 14e27a8 into openshift:master Feb 26, 2021
@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.6

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 26, 2021

@ahardin-rh: #29896 failed to apply on top of branch "enterprise-4.6":

Applying: [RHDEVDOCS-2730](https://issues.redhat.com/browse/RHDEVDOCS-2730) Update oc get cronjob example
Using index info to reconstruct a base tree...
M	modules/cluster-logging-elasticsearch-retention.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-elasticsearch-retention.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-elasticsearch-retention.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [RHDEVDOCS-2730](https://issues.redhat.com/browse/RHDEVDOCS-2730) Update oc get cronjob example
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.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

@ahardin-rh: new pull request created: #29898

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.

@openshift-cherrypick-robot

@ahardin-rh: new pull request created: #29899

Details

In response to this:

/cherrypick enterprise-4.8

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.6 branch/enterprise-4.7 branch/enterprise-4.8 lgtm Indicates that a PR is ready to be merged. 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.

5 participants