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: use authorization error to token validation fail #1223

Merged
merged 1 commit into from
Aug 7, 2019

Conversation

cd1989
Copy link
Contributor

@cd1989 cd1989 commented Aug 7, 2019

What this PR does / why we need it:

Add your description

Which issue(s) this PR is related to (optional, link to 3rd issue(s)):

Fixes #

Reference to #

Special notes for your reviewer:

/cc @your-reviewer

Release note:

NONE

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 7, 2019
@supereagle
Copy link
Member

/lgtm

@caicloud-bot caicloud-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2019
@caicloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: supereagle

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:

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

@caicloud-bot caicloud-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 7, 2019
@caicloud-bot caicloud-bot merged commit bd2f737 into caicloud:master Aug 7, 2019
@zhujian7
Copy link
Collaborator

zhujian7 commented Aug 8, 2019

/cherrypick release-1.0

@caicloud-bot
Copy link
Collaborator

@zhujian7: #1223 failed to apply on top of branch "release-1.0":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/server/biz/scm/bitbucket/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/server/biz/scm/bitbucket/server/server.go
CONFLICT (content): Merge conflict in pkg/server/biz/scm/bitbucket/server/server.go
Patch failed at 0001 fix: use authorization error to token validation fail

In response to this:

/cherrypick release-1.0

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.

@zhujian7
Copy link
Collaborator

zhujian7 commented Aug 8, 2019

/cherrypick release-1.0

@caicloud-bot
Copy link
Collaborator

@zhujian7: new pull request created: #1244

In response to this:

/cherrypick release-1.0

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
approved Indicates a PR has been approved by an approver from all required OWNERS files. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants