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

Reintegrate jfryman/puppet-nginx#331 (upstream exports/collections) #347

Merged
merged 1 commit into from
Jun 24, 2014

Conversation

rabbitt
Copy link
Contributor

@rabbitt rabbitt commented Jun 21, 2014

p.s. Might I suggest that, prior to merging, anyone whom has any opinions on this (@leepa, @jfryman, @rainopik, @zxjinn, ??) take a look and reflect on whether or not this is at a point where it's ready?

- resurrecting voxpupuli#331 from @rainopik
- update (concat/stdlib) dependency version requirements based on current usage
- fix upstream tests to work with rainopik's changes in what was voxpupuli#331
@rainopik
Copy link
Contributor

Tried this on my setup, seems ok to me.

@leepa
Copy link
Contributor

leepa commented Jun 22, 2014

Just a note to say that I'll merge this into my fork in a bit and give a go - but it'll probably be Sunday Evening UK time that I do that.

The change itself looks sane.

@zxjinn
Copy link

zxjinn commented Jun 23, 2014

After upgrading my concat to 1.1.0 from 1.0.2 it works as advertised using Ubuntu 12.04, and Puppet 3.5.1. Great work @rabbitt

@jfryman
Copy link
Contributor

jfryman commented Jun 24, 2014

🤘

jfryman pushed a commit that referenced this pull request Jun 24, 2014
Reintegrate #331 (upstream exports/collections)
@jfryman jfryman merged commit 400e58a into voxpupuli:master Jun 24, 2014
@rabbitt rabbitt deleted the feature/upstream-exports branch June 25, 2014 00:36
cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Oct 23, 2017
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