Skip to content
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

Closed
wants to merge 9 commits into from
Closed

8 - Deployment specs missing selector #9

wants to merge 9 commits into from

Conversation

denebeim
Copy link
Contributor

Include selectors in the spec portion of deployment yaml files.

@micw
Copy link
Contributor

micw commented Nov 17, 2019

@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.

@micw micw closed this Nov 17, 2019
@denebeim
Copy link
Contributor Author

OK, so I shouldn't have done the merge? I should have just dumped the diff, and reapplied it to a clean clone?

@micw
Copy link
Contributor

micw commented Nov 17, 2019

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).

@micw
Copy link
Contributor

micw commented Nov 17, 2019

Btw, just saw that the merge commit contained the selector for mysql. I'll add it later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants