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

Bug 1822122: Add back some missing metrics #37

Merged
merged 2 commits into from Apr 8, 2020

Conversation

stlaz
Copy link
Member

@stlaz stlaz commented Apr 8, 2020

No description provided.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2020
@stlaz stlaz changed the title Add back some missing metrics Bug 1822122: Add back some missing metrics Apr 8, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 8, 2020
@openshift-ci-robot
Copy link
Contributor

@stlaz: This pull request references Bugzilla bug 1822122, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1822122: Add back some missing metrics

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.

@deads2k
Copy link
Contributor

deads2k commented Apr 8, 2020

/lgtm

@stlaz
Copy link
Member Author

stlaz commented Apr 8, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot

@stlaz: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.4

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.

@stlaz
Copy link
Member Author

stlaz commented Apr 8, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot

@stlaz: once the present PR merges, I will cherry-pick it on top of release-4.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.3

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.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 8, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, stlaz

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 1651a24 into openshift:master Apr 8, 2020
@openshift-ci-robot
Copy link
Contributor

@stlaz: All pull requests linked via external trackers have merged: openshift/oauth-server#37. Bugzilla bug 1822122 has been moved to the MODIFIED state.

In response to this:

Bug 1822122: Add back some missing metrics

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.

@openshift-cherrypick-robot

@stlaz: #37 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/gopkg.in/yaml.v2/decode.go
M	vendor/gopkg.in/yaml.v2/scannerc.go
M	vendor/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
CONFLICT (content): Merge conflict in vendor/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
Auto-merging vendor/gopkg.in/yaml.v2/scannerc.go
Auto-merging vendor/gopkg.in/yaml.v2/decode.go
CONFLICT (content): Merge conflict in vendor/gopkg.in/yaml.v2/decode.go
Removing vendor/golang.org/x/crypto/poly1305/sum_arm.s
Removing vendor/golang.org/x/crypto/poly1305/sum_arm.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Patch failed at 0001 bump kube to 1.17.4

In response to this:

/cherry-pick release-4.3

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.

@openshift-cherrypick-robot

@stlaz: #37 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/golang.org/x/crypto/poly1305/sum_arm.s
Removing vendor/golang.org/x/crypto/poly1305/sum_arm.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
Patch failed at 0001 bump kube to 1.17.4

In response to this:

/cherry-pick release-4.4

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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

5 participants