deploy: Add --no-merge #2081
Merged
deploy: Add --no-merge #2081
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
|
Argh, state shared across the admin base test into uboot. Let's just make it a separate test. |
|
/test sanity |
All of the underlying libostree APIs have supported passing `NULL` for a merge deployment for...a long time. But we never plumbed it up into the CLI. Add a `--no-merge` option to aid people who want to do a "factory reset": ostreedev#1793
|
OK I just squashed in the same fix as coreos/rpm-ostree#2067 here. |
|
Nice! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, d4s, jlebon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
All of the underlying libostree APIs have supported passing
NULLfor a merge deployment for...a long time. But we never plumbed
it up into the CLI.
Add a
--no-mergeoption to aid people who want to do a "factory reset":#1793