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

Rebase single-node branch against master #113

Closed
wants to merge 2 commits into from

Conversation

StevenACoffman
Copy link
Contributor

Hello, this fork had aged a bit, and for my own purposes, I rebased it against master and resolved the conflicts along the way. Not sure how this works in a PR, but FYI.

@StevenACoffman StevenACoffman changed the title Rebase against master Rebase single-node branch against master Dec 22, 2017
@solsson
Copy link
Contributor

solsson commented Dec 31, 2017

I'll rebase the fork, and also update it wrt #107. Keeping this PR open as a reminder.

@solsson
Copy link
Contributor

solsson commented Jan 8, 2018

Rebased #44 now, and introduced #118. These long-lived branches aren't elegant, but I hesitate to merge master to them with all the unrelated commits that introduces. I also hesitate to convert this repo to helm charts etc, because I think templating obscures everything.

@solsson solsson closed this Jan 8, 2018
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