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

jsonnet: bump and regenerate #690

Merged
merged 2 commits into from Oct 12, 2021

Conversation

hexfusion
Copy link
Contributor

This PR bumps our base jsonnet to align with upstream.

Notable changes include:

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2021
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 11, 2021
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2021
@hexfusion
Copy link
Contributor Author

cc @lilic

Copy link
Contributor

@lilic lilic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

hack/generate.sh Show resolved Hide resolved
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 12, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 12, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, lilic

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

@openshift-merge-robot openshift-merge-robot merged commit 25e306b into openshift:master Oct 12, 2021
@hexfusion hexfusion deleted the fix-grpc-slow branch October 12, 2021 10:13
@hexfusion
Copy link
Contributor Author

/cherry-pick release-4.9

@openshift-cherrypick-robot

@hexfusion: #690 failed to apply on top of branch "release-4.9":

Applying: hack: give user message regarding generate.sh dependencies
Applying: jsonnet: bump and regenerate
Using index info to reconstruct a base tree...
M	jsonnet/jsonnetfile.lock.json
M	jsonnet/vendor/github.com/etcd-io/etcd/contrib/mixin/mixin.libsonnet
M	manifests/0000_90_etcd-operator_03_prometheusrule.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_90_etcd-operator_03_prometheusrule.yaml
Auto-merging jsonnet/vendor/github.com/etcd-io/etcd/contrib/mixin/mixin.libsonnet
Auto-merging jsonnet/jsonnetfile.lock.json
CONFLICT (content): Merge conflict in jsonnet/jsonnetfile.lock.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 jsonnet: bump and regenerate
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:

/cherry-pick release-4.9

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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants