-
Notifications
You must be signed in to change notification settings - Fork 68
namespace resource: support get raw object in get() - Cherry-pick #242
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
Conversation
|
/verified |
|
/approve |
|
Rename the title, Cherry-pick is not informative title. |
.pre-commit-config.yaml
Outdated
| repos: | ||
| - repo: https://github.com/hadialqattan/pycln | ||
| rev: "v0.0.1-beta.1" | ||
| rev: "v1.0.3" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is not related to this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change was picked up by cherry-pick command. I simply resolved the conflict by picking what is in head. Also looks like this change is part of cherrypick against 1.3.10. 0b684ae. Please suggest what needs to be done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When resolving a conflict and working on a different repo branch (i.e cherrypick from master to 1.5.x), you should use the code that exists in the branch that you're working on (and not the code that you've cherry-picked from).
This way you avoid adding extra code that should not be cherrypicked.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I will remove this, since it does not look like this is in 1.5.3.54. Looks like the same mistake happened with the last cherry-pick(0b684ae), please have someone take a look at it and undo the same as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
/unapprove |
|
Kudos, SonarCloud Quality Gate passed! |
|
/approve |








Short description: Need to cherry-pick #185 to branch 1.5.3.z
More details:
What this PR does / why we need it: Need this for packageManifest resources
Which issue(s) this PR fixes:
Special notes for reviewer:
Bug: