-
Notifications
You must be signed in to change notification settings - Fork 131
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
8 - Deployment specs missing selector #9
Conversation
- Fix conditional usage of apps/v1 as per comments
# Conflicts: # mailu/templates/mysql.yaml
@denebeim thank you very much. Unfortunately, the pull request is not cleanly based on the current master. To keep the git history clean, I have cherry-picked your commit into master. |
OK, so I shouldn't have done the merge? I should have just dumped the diff, and reapplied it to a clean clone? |
Best would have been to rebase. With merge you create a commit that contains conflict resolution. With rebase you rewrite your commits not to have any conflicts (you let them base on the new status of the other branch). |
Btw, just saw that the merge commit contained the selector for mysql. I'll add it later. |
Include selectors in the spec portion of deployment yaml files.