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

vendor: bump github.com/evanphx/json-patch #68428

Merged
merged 1 commit into from Sep 8, 2018

Conversation

@philips
Contributor

philips commented Sep 7, 2018

Grab important bug fix that can cause a panic() from this package on
certain inputs. See evanphx/json-patch@73af7f5

NONE
@liggitt

This comment has been minimized.

Show comment
Hide comment
@liggitt

liggitt Sep 7, 2018

Member

/lgtm

Member

liggitt commented Sep 7, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Sep 7, 2018

@cjcullen cjcullen added this to the v1.12 milestone Sep 7, 2018

@cjcullen

This comment has been minimized.

Show comment
Hide comment
@cjcullen

cjcullen Sep 7, 2018

Member

/assign @cblecker
/assign @thockin

Member

cjcullen commented Sep 7, 2018

/assign @cblecker
/assign @thockin

@philips

This comment has been minimized.

Show comment
Hide comment
@philips

philips Sep 7, 2018

Contributor

/test pull-kubernetes-e2e-kops-aws

Contributor

philips commented Sep 7, 2018

/test pull-kubernetes-e2e-kops-aws

@@ -1522,8 +1522,8 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Comment": "v3.0.0-23-g94e38aa",

This comment has been minimized.

@liggitt

liggitt Sep 7, 2018

Member

I'm surprised none of the files under the staging directories needed this update as well

@liggitt

liggitt Sep 7, 2018

Member

I'm surprised none of the files under the staging directories needed this update as well

@philips

This comment has been minimized.

Show comment
Hide comment
@philips

philips Sep 7, 2018

Contributor
Contributor

philips commented Sep 7, 2018

@cblecker

This comment has been minimized.

Show comment
Hide comment
@cblecker

cblecker Sep 7, 2018

Member

/sig release
/kind bug

Member

cblecker commented Sep 7, 2018

/sig release
/kind bug

vendor: bump github.com/evanphx/json-patch
Grab important bug fix that can cause a `panic()` from this package on
certain inputs. See evanphx/json-patch@73af7f5

Signed-off-by: Brandon Philips <brandon@ifup.org>
@philips

This comment has been minimized.

Show comment
Hide comment
@philips

philips Sep 8, 2018

Contributor

/hold cancel

@liggitt Ran the ./hack/update-staging-godeps.sh script. Is there anything else I am missing? Sorry, it has been awhile since I have bumped a dep.

Contributor

philips commented Sep 8, 2018

/hold cancel

@liggitt Ran the ./hack/update-staging-godeps.sh script. Is there anything else I am missing? Sorry, it has been awhile since I have bumped a dep.

@k8s-ci-robot k8s-ci-robot added lgtm and removed do-not-merge/hold labels Sep 8, 2018

@cblecker

/lgtm
/approve

@cblecker cblecker removed the needs-kind label Sep 8, 2018

@cblecker

This comment has been minimized.

Show comment
Hide comment
@cblecker

cblecker Sep 8, 2018

Member

/retest

Member

cblecker commented Sep 8, 2018

/retest

@liggitt

This comment has been minimized.

Show comment
Hide comment
@liggitt

liggitt Sep 8, 2018

Member

/lgtm
/retest

Member

liggitt commented Sep 8, 2018

/lgtm
/retest

@k8s-ci-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-ci-robot

k8s-ci-robot Sep 8, 2018

Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, dougm, liggitt, philips

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

Contributor

k8s-ci-robot commented Sep 8, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, dougm, liggitt, philips

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-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Sep 8, 2018

Contributor

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

Contributor

k8s-merge-robot commented Sep 8, 2018

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

@k8s-merge-robot

This comment has been minimized.

Show comment
Hide comment
@k8s-merge-robot

k8s-merge-robot Sep 8, 2018

Contributor

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

Contributor

k8s-merge-robot commented Sep 8, 2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

@k8s-merge-robot k8s-merge-robot merged commit 5af5f1e into kubernetes:master Sep 8, 2018

17 of 18 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-kubemark-e2e-gce-big
Details
cla/linuxfoundation philips authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
@dougm

This comment has been minimized.

Show comment
Hide comment
@dougm

dougm Sep 8, 2018

Member

Merged to release-1.12 branch via branchff: https://github.com/kubernetes/kubernetes/commits/release-1.12

Member

dougm commented Sep 8, 2018

Merged to release-1.12 branch via branchff: https://github.com/kubernetes/kubernetes/commits/release-1.12

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment