Backport prometheus fix to 2.x #1782
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Simeon Widdis <[email protected]>
Signed-off-by: YANGDB <[email protected]>
Swiddis
requested review from
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
mengweieric,
vamsimanohar,
penghuo,
seankao-az and
anirudha
as code owners
This reverts commit 42ac9c4. Signed-off-by: Simeon Widdis <[email protected]>
Swiddis
force-pushed
the
backport-prom-fix
branch
from
15cdcb5 to
e40487a
Compare
YANG-DB
approved these changes
Apr 30, 2024
RyanL1997
approved these changes
May 1, 2024
rupal-bq
approved these changes
May 1, 2024
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
May 1, 2024
* Add 2.14 release notes Signed-off-by: Simeon Widdis <[email protected]> * fix issue #1665 (#1757) Signed-off-by: YANGDB <[email protected]> * Revert "Add 2.14 release notes" This reverts commit 42ac9c4. Signed-off-by: Simeon Widdis <[email protected]> --------- Signed-off-by: Simeon Widdis <[email protected]> Signed-off-by: YANGDB <[email protected]> Co-authored-by: YANGDB <[email protected]> (cherry picked from commit f9a6e49) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
There was a merge conflict in utils preventing an automatic backport
Issues Resolved
N/A
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.