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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #49259: update json-patch to fix nil value issue when creating mergepatch #59324

Merged
merged 2 commits into from
Mar 2, 2018
Merged

Automated cherry pick of #49259: update json-patch to fix nil value issue when creating mergepatch #59324

merged 2 commits into from
Mar 2, 2018

Conversation

yue9944882
Copy link
Member

@yue9944882 yue9944882 commented Feb 4, 2018 •
edited by wojtek-t
Loading

Cherry pick of #49259 on release-1.7.

#49259: update json-patch to fix nil value issue when creating mergepatch

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 4, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Feb 4, 2018
@yue9944882
Copy link
Member Author

/release-note-none
/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Feb 4, 2018
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 4, 2018
@yue9944882
Copy link
Member Author

yue9944882 commented Feb 4, 2018 •
edited
Loading

/assign @brendandburns
/sig cli

@yue9944882
Copy link
Member Author

yue9944882 commented Feb 5, 2018 •
edited
Loading

cc @wojtek-t
release-1.7 branch mgr ^^

@k8s-ci-robot k8s-ci-robot added the sig/cli Categorizes an issue or PR as relevant to SIG CLI. label Feb 5, 2018
@brendandburns
Copy link
Contributor

I believe this should be done as a patch to the master branch and then cherry-picked back into this branch...

@yue9944882 yue9944882 force-pushed the fix-json-encode-slash-escape branch from 4bf282c to a299171 Compare February 14, 2018 07:34
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 14, 2018
@yue9944882 yue9944882 changed the title update json-patch vendor & mute slash escape Cherry-pick of 8447cee0: update json-patch to fix nil value issue when creating mergepatch Feb 14, 2018
@m1093782566
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 28, 2018
@yue9944882 yue9944882 force-pushed the fix-json-encode-slash-escape branch from a299171 to c0666fb Compare February 28, 2018 10:32
@yue9944882
Copy link
Member Author

yue9944882 commented Feb 28, 2018 •
edited
Loading

aka backport of #49259

@yue9944882 yue9944882 force-pushed the fix-json-encode-slash-escape branch from c0666fb to 5f783b3 Compare February 28, 2018 10:35
@yue9944882 yue9944882 changed the title Cherry-pick of 8447cee0: update json-patch to fix nil value issue when creating mergepatch Backport #49259 to 1.7: fix nil value issue when creating mergepatch Feb 28, 2018
@yue9944882
Copy link
Member Author

@brendanburns How do you think about approving this? Or is 1.7 branch under maintainence yet?

@wojtek-t wojtek-t changed the title Backport #49259 to 1.7: fix nil value issue when creating mergepatch Automated cherry pick of #49259: update json-patch to fix nil value issue when creating mergepatch Mar 2, 2018
@wojtek-t wojtek-t added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. status/approved-for-milestone and removed release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Mar 2, 2018
@wojtek-t
Copy link
Member

wojtek-t commented Mar 2, 2018

/lgtm
/approve no-issue

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 2, 2018
@wojtek-t wojtek-t added this to the v1.7 milestone Mar 2, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wojtek-t, yue9944882

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2018
@yue9944882
Copy link
Member Author

@k8s-merge-robot PTAL :-)

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit e47765d into kubernetes:release-1.7 Mar 2, 2018
@yue9944882 yue9944882 mentioned this pull request May 5, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@brendandburns brendandburns

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
7 participants
@yue9944882 @brendandburns @m1093782566 @wojtek-t @k8s-ci-robot @k8s-github-robot @dixudx