-
Notifications
You must be signed in to change notification settings - Fork 186
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
fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" #3336
Merged
xiangce
merged 1 commit into
RedHatInsights:master
from
huali027:enhance_satellite_combiner
Feb 17, 2022
Merged
fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" #3336
xiangce
merged 1 commit into
RedHatInsights:master
from
huali027:enhance_satellite_combiner
Feb 17, 2022
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
Contributor
huali027
commented
Feb 16, 2022
•
edited
Loading
edited
- Have you followed the guidelines in our Contributing document, including the instructions about commit messages?
- Is this PR to correct an issue?
- Is this PR an enhancement?
* Check the hostname in rhsm.conf too to decide if it's a satellite server or capsule when it exists. Sometimes the packages satellite and satellite-capsule are installed at the same time, but from the hostname in rhsm.conf, we know it's just a capsule server. Signed-off-by: Huanhuan Li <[email protected]>
huali027
changed the title
Enhance combiner "SatelliteVersion" and "CapsuleVersion"
fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion"
Feb 16, 2022
Fixes #3335. |
@xiangce Please help to review, thanks. |
xiangce
approved these changes
Feb 16, 2022
psachin
pushed a commit
that referenced
this pull request
Feb 17, 2022
* Check the hostname in rhsm.conf too to decide if it's a satellite server or capsule when it exists. Sometimes the packages satellite and satellite-capsule are installed at the same time, but from the hostname in rhsm.conf, we know it's just a capsule server. Signed-off-by: Huanhuan Li <[email protected]> (cherry picked from commit d4d7c0a)
xiangce
pushed a commit
that referenced
this pull request
Feb 22, 2022
#3342) * Revert "fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" (#3336)" This reverts commit d4d7c0a. Signed-off-by: Huanhuan Li <[email protected]> * fix: Enhance "CapsuleVersion" * From some archives, I found "foreman" is installed with "satellite-capsule", but it is a true satellite capsule server. Signed-off-by: Huanhuan Li <[email protected]>
xiangce
pushed a commit
that referenced
this pull request
Feb 22, 2022
#3342) * Revert "fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" (#3336)" This reverts commit d4d7c0a. Signed-off-by: Huanhuan Li <[email protected]> * fix: Enhance "CapsuleVersion" * From some archives, I found "foreman" is installed with "satellite-capsule", but it is a true satellite capsule server. Signed-off-by: Huanhuan Li <[email protected]> (cherry picked from commit 3181747)
xiangce
pushed a commit
that referenced
this pull request
Sep 6, 2024
* Check the hostname in rhsm.conf too to decide if it's a satellite server or capsule when it exists. Sometimes the packages satellite and satellite-capsule are installed at the same time, but from the hostname in rhsm.conf, we know it's just a capsule server. Signed-off-by: Huanhuan Li <[email protected]>
xiangce
pushed a commit
that referenced
this pull request
Sep 6, 2024
#3342) * Revert "fix: Enhance combiner "SatelliteVersion" and "CapsuleVersion" (#3336)" This reverts commit 2078701. Signed-off-by: Huanhuan Li <[email protected]> * fix: Enhance "CapsuleVersion" * From some archives, I found "foreman" is installed with "satellite-capsule", but it is a true satellite capsule server. Signed-off-by: Huanhuan Li <[email protected]>
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.