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

K8S dex-overlord.yaml ordering fix #422

Merged
merged 1 commit into from
Apr 20, 2016
Merged

K8S dex-overlord.yaml ordering fix #422

merged 1 commit into from
Apr 20, 2016

Conversation

gmgreg
Copy link
Contributor

@gmgreg gmgreg commented Apr 20, 2016

ConfigMap must be defined before it can be used; moved the ConfigMap definition prior to the dec-overlord container definition in the yams file.

@ericchiang
Copy link
Contributor

lgmt, though fyi you have the change from #421 in here as well. Please remove that and I can merge this change :)

@gmgreg
Copy link
Contributor Author

gmgreg commented Apr 20, 2016

Thanks. Should be okay now (please confirm).

@ericchiang
Copy link
Contributor

@gmgreg please squash your commits: https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git

Your change history still record edits to the README, even if the net result is no changes to that file, so git is reporting a merge conflict.

@gmgreg
Copy link
Contributor Author

gmgreg commented Apr 20, 2016

Thanks for your patience (obviously I'm no git master). Hope this time works.

@ericchiang
Copy link
Contributor

No problem. Thanks for your contribution!

@ericchiang ericchiang merged commit 4063575 into dexidp:master Apr 20, 2016
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.

2 participants