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

Alt gateway in DHCP #731

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Alt gateway in DHCP #731

wants to merge 4 commits into from

Conversation

WildRat
Copy link
Contributor

@WildRat WildRat commented Feb 16, 2018

  1. Add option to use alternative gateway IP in DHCP
  2. Change DHCP lease time units from hours to minutes

Fix e-mail plugin internalization bug
1) Add option to use alternative gateway IP in DHCP
2) Change DHCP lease time units from hours to minutes
@lantis1008
Copy link
Contributor

Can you seperate these even further? Each one shouldn’t have the previous changes in it.
We can kind of review it by accepting 1 at a time which will fix the next one, but it is best to have them completely separated.

@d3fz
Copy link
Contributor

d3fz commented Feb 17, 2018

I've noticed that as well. Been there, done that.

What's the best approach here? Rebase? Then maybe a forced push (since there's no downstream activity on this one)?

@lantis1008
Copy link
Contributor

Assuming the branch is clean, reset to before these changes and create 4 new branches.
Then apply one change to each. No force push required you can just destroy this branch.

You can branch from a point in time via github.com as well by “browse repository at this commit”, then attempt to create branch as usual and it will branch at that point

@ericpaulbishop
Copy link
Owner

You don't need to rebase. Checkout the commit before the proposed changes and create a new branch. Then use the git cherry-pick command to add the commits you want to the new branch. Merge in the my master branch to make sure it will merge ok, and then send a pull request for that branch.

I'll add that your proposed changes other than the alt DHCP gateway look good, and I'll merge the pull request with those. I need to take a closer look at the alt DHCP gateway proposal before I decide on that one.

@ispyisail
Copy link
Contributor

Whats the status of this PR?

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.

5 participants