Update aws-cwa-ciwindows by merging new changes from aws-cwa-dev
#155
+169
−22
Conversation
This file contains 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
…rics (amazon-contributing#144) * Return error for enhanced container insights for missing metrics in emfexporter * move import * Add debug line and make error message more descriptive * Fix import again * Run make gotidy * Revert "Run make gotidy" This reverts commit 5b9ce4d. * Update exporter/awsemfexporter/metric_translator_test.go Co-authored-by: Jeffrey Chien <chienjef@amazon.com> --------- Co-authored-by: Jeffrey Chien <chienjef@amazon.com>
KlwntSingh
changed the title
aws-cwa-dev into aws-cwa-ciwindowsaws-cwa-ciwindows by merging new changes from aws-cwa-dev
chadpatel
approved these changes
Jan 30, 2024
|
Merging is squashing the commits, This will lead to merge conflicts when Raising PR from this dev branch again |
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:
Updated
aws-cwa-ciwindowsby mergingaws-cwa-devusinggit merge aws-cwa-dev.Conflicts
Resolved conflict in
kubeletclient.go