Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix double quotation error #124

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Conversation

chilianyi
Copy link
Contributor

@chilianyi chilianyi commented Oct 11, 2023

@yudong2015
Copy link
Contributor

/lgtm
/approve

@ks-ci-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chilianyi, yudong2015

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [chilianyi,yudong2015]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ks-ci-bot ks-ci-bot merged commit e44e1d8 into kubesphere-sigs:master Oct 24, 2023
2 checks passed
@yudong2015
Copy link
Contributor

/cherrypick release-3.4

@ks-ci-bot
Copy link
Contributor

@yudong2015: #124 failed to apply on top of branch "release-3.4":

Applying: Fix double quotation error
Using index info to reconstruct a base tree...
M	charts/ks-devops/templates/cluster-step-templates.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ks-devops/templates/cluster-step-templates.yaml
CONFLICT (content): Merge conflict in charts/ks-devops/templates/cluster-step-templates.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix double quotation error
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".

In response to this:

/cherrypick release-3.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.

@ks-ci-bot
Copy link
Contributor

@yudong2015: new issue created for failed cherrypick: #130

In response to this:

/cherrypick release-3.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.

@yudong2015
Copy link
Contributor

/cherrypick release-3.4

@ks-ci-bot
Copy link
Contributor

@yudong2015: #124 failed to apply on top of branch "release-3.4":

Applying: Fix double quotation error
Using index info to reconstruct a base tree...
M	charts/ks-devops/templates/cluster-step-templates.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ks-devops/templates/cluster-step-templates.yaml
CONFLICT (content): Merge conflict in charts/ks-devops/templates/cluster-step-templates.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix double quotation error
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".

In response to this:

/cherrypick release-3.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.

@ks-ci-bot
Copy link
Contributor

@yudong2015: new issue created for failed cherrypick: #133

In response to this:

/cherrypick release-3.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.

@yudong2015
Copy link
Contributor

yudong2015 commented Oct 24, 2023

Cherry-pick to release-3.4 in pull request #131 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants