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

allow iptables package to be updated #583

Merged
merged 1 commit into from
Feb 3, 2016

Conversation

cristifalcas
Copy link
Contributor

Add a new parameter in order to allow the iptables package to be updated

@bmjen
Copy link
Contributor

bmjen commented Dec 18, 2015

Thanks @cristifalcas! This looks like a good addition. Can you please squash the two commits into one?

@mentat
Copy link
Contributor

mentat commented Jan 25, 2016

Hi again @cristifalcas, would you mind squashing this down?

@cristifalcas
Copy link
Contributor Author

sorry for the delay

@tphoney
Copy link
Contributor

tphoney commented Feb 1, 2016

@cristifalcas Thanks for the work that you have put in, there are a number tests failing, could you please have a look.

@cristifalcas
Copy link
Contributor Author

Fixed

@tphoney
Copy link
Contributor

tphoney commented Feb 2, 2016

Thanks, can you please squash. the code looks good to me.

@cristifalcas
Copy link
Contributor Author

I have no idea how to remove the "Merge remote-tracking branch" commit. Is it ok if I close this PR and open a new one?

@tphoney
Copy link
Contributor

tphoney commented Feb 2, 2016

if you are on the CLI:
git rebase --interactive HEAD~2

it will look something like

pick 690cb20 Adding bug workaround in tests for Debian 8
pick 750948e Enabled usage of the $ntpsigndsocket parameter, for socket signing when needed.

change it to

pick 690cb20 Adding bug workaround in tests for Debian 8
s 750948e Enabled usage of the $ntpsigndsocket parameter, for socket signing when needed.

This will squash that commit.

Then re-push again

@tphoney
Copy link
Contributor

tphoney commented Feb 2, 2016

@tphoney
Copy link
Contributor

tphoney commented Feb 2, 2016

or create a new pr 👍

@cristifalcas
Copy link
Contributor Author

done

@tphoney
Copy link
Contributor

tphoney commented Feb 3, 2016

great work !!!

tphoney added a commit that referenced this pull request Feb 3, 2016
allow iptables package to be updated
@tphoney tphoney merged commit d39aa14 into puppetlabs:master Feb 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants