Merge conflicts #2777
Merged
Merge conflicts #2777
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
Co-authored-by: Kevin Clark <kevin.clark@microsoft.com>
Merge hotfix-2.3.1 into master
…e#2349) Co-authored-by: Laveesh Rohra <larohra@microsoft.com>
Azure#2358) * Use handler status if extension status is None when computing the ExtensionsSummary * Add NotReady to convergence statuses Co-authored-by: narrieta <narrieta>
Merge release-2.4.0.0 into master
* define ExtensionsSummary.__eq__ * Fix test name * Fix test name * Fix test name Co-authored-by: narrieta <narrieta>
Co-authored-by: narrieta <narrieta>
* Improve error message for vmSettings errors * Add etag and correlation id * pylint warning Co-authored-by: narrieta <narrieta>
Azure#2404) Co-authored-by: narrieta <narrieta>
Merge release 2.5.0.0 into master
* Set Agent version to 2.7.0.0 * Remove duplicate import Co-authored-by: narrieta <narrieta>
* Simplify the logic to update the extensions goal state * Added telemetry for NotSupported * Added comments * Do not support old hostgaplugin Co-authored-by: narrieta <narrieta>
Parse missing agent manifests as empty
Set agent version to 2.8.0.7
…#2621) * Retry HGAP's extensionsArtifact requests on BAD_REQUEST status * python 2.6 compat Co-authored-by: narrieta <narrieta>
…#2621) (Azure#2622) * Retry HGAP's extensionsArtifact requests on BAD_REQUEST status * python 2.6 compat Co-authored-by: narrieta <narrieta> (cherry picked from commit dbc82d3)
Co-authored-by: narrieta <narrieta>
Co-authored-by: narrieta <narrieta>
(cherry picked from commit b8ca432) Co-authored-by: Nageswara Nandigam <84482346+nagworld9@users.noreply.github.com>
(cherry picked from commit e540728) Co-authored-by: Nageswara Nandigam <84482346+nagworld9@users.noreply.github.com>
Co-authored-by: narrieta <narrieta>
* Cleanup history directory when creating new subdirectories * Review feedback Co-authored-by: narrieta <narrieta>
Merge hotfix 2.7.3.0 to master
Set agent version to 2.8.0.10
* Save sharedconfig to disk * Update tests * pylint warnings Co-authored-by: narrieta <narrieta>
Co-authored-by: narrieta <narrieta>
Merge release 2.8 to master
Co-authored-by: microsoft-github-policy-service[bot] <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
narrieta
approved these changes
Mar 7, 2023
Codecov Report
@@ Coverage Diff @@
## release-2.9.0.0 #2777 +/- ##
===================================================
+ Coverage 71.91% 71.92% +0.01%
===================================================
Files 103 103
Lines 15713 15713
Branches 2247 2247
===================================================
+ Hits 11300 11302 +2
- Misses 3895 3898 +3
+ Partials 518 513 -5
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
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
Issue #
PR information
Quality of Code and Contribution Guidelines