This repository has been archived by the owner on Sep 17, 2024. It is now read-only.
cli: enable loading default profiles turnkey (backport #943) #1074
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* cli: enable loading default profiles turnkey Fixes #933 * update NOTICE * Fix additional lint issues in ingest_manager_test * Cleanup comment and trace log in GetComposeFile * Provide better trace feedback if missing docker-compose * Update cli/config/config.go * chore: add back traces when extracting the files from the box (#946) * fix: use a more comprehensive initialisation method for configs As go init() method is not deterministic, I found that the logger init was not called at the right time. With change we ensure that the Init is: 1) called first 2) existing it the config was already populated * chore: add back traces when extracting the files from the box Signed-off-by: Adam Stokes <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]> (cherry picked from commit ae5b9fe) # Conflicts: # cli/go.mod # cli/go.sum # e2e/_suites/fleet/ingest_manager_test.go
mergify
bot
added
the
conflicts
mdelapenya
reviewed
Apr 22, 2021
mdelapenya
reviewed
Apr 22, 2021
💔 Build Failed
Expand to view the summary
Build stats
Trends 🧪Steps errors
Expand to view the steps failures
|
9 tasks
|
This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏 |
|
Superseded by #1077 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatic backport of pull request #943 done by Mergify.
Cherry-pick of ae5b9fe has failed:
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/