Skip to content

Commit

Permalink
Merge pull request #123065 from Richabanker/automated-cherry-pick-of-…
Browse files Browse the repository at this point in the history
…#122750-upstream-release-1.29

Automated cherry pick of #122750: Add processStartTime in metrics/slis

Kubernetes-commit: f6b2ccbd6ae7848a314f0afa9c97e27a30cd2aa0
  • Loading branch information
k8s-publishing-bot committed Feb 9, 2024
1 parent d64bf7a commit e8f624c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ require (
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc // indirect
k8s.io/api v0.0.0-20240209025148-f5eca0431ee2 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc
k8s.io/api => k8s.io/api v0.0.0-20240209025148-f5eca0431ee2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647
k8s.io/client-go => k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc h1:z2Ii/wAgmsfREj444+Z0jFzHslm+Ep/M0pxUqonXMkw=
k8s.io/api v0.0.0-20240110173429-a48c0a49b1dc/go.mod h1:JS1rn0RBc46vCh2T2+zcnx+oNtvh+pDndpURdiWnHNc=
k8s.io/api v0.0.0-20240209025148-f5eca0431ee2 h1:SalYyqp9fvQyZ64OIop5pLm+DH7HaHrAVWzy/QqOPTo=
k8s.io/api v0.0.0-20240209025148-f5eca0431ee2/go.mod h1:JS1rn0RBc46vCh2T2+zcnx+oNtvh+pDndpURdiWnHNc=
k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647 h1:SfqmT8ezTnkZc9G0t8b4s6+Z6zT/rMKhZm9yQq5wG+U=
k8s.io/apimachinery v0.0.0-20240110172605-dc7e034c8647/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
k8s.io/client-go v0.0.0-20240110175813-baea19d6e81c h1:S8iocBcKfLfrC9VQy38QMJeChfF3B5QwJKsNrA9MI0Q=
Expand Down

0 comments on commit e8f624c

Please sign in to comment.