Update from upstream repo Madek/madek-instance#1
Open
1egoman wants to merge 66 commits intoKTE:masterfrom
Open
Update from upstream repo Madek/madek-instance#11egoman wants to merge 66 commits intoKTE:masterfrom
1egoman wants to merge 66 commits intoKTE:masterfrom
Conversation
ideally the README shouldn’t change so forks that edited theirs don’t get merge conflicts
move examples into a folder add upgrade script
not needed for simple setup (1 host)
its faster because we don't need everything
from now on all updates to this project (pushes to `master`) will only happen once for each Madek release all commits will be prefixed like this one (or [Madek] for Madek relases)
config will only be applied when its in CWD, but examples in Guide issue playbook command from instance inventory root. making a symlink ensures that the correct config is used, similar to symlinking the `all.yml` vars file.
urs-van-binsbergen
force-pushed
the
master
branch
from
4e475fd to
4cc4461
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Hello!
The remote
Madek/madek-instancehas some new changes that aren't in this fork.So, here they are, ready to be merged! 🎉
If this pull request can be merged without conflict, you can publish your software
with these new changes. Otherwise, if you have merge conflicts, this
is the place to fix them.
Have fun! 👋
From,
🏊 Your Neighborly Backstroke Bot
PS. Hey, there's a new version of Backstroke available. If you'd like to configure repo-to-repo syncing or sync to all forks, check it out here.