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.

Sign up for GitHub

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

Jump to bottom

Setenv fix #35

Merged
merged 2 commits into from Sep 3, 2014
Merged

Setenv fix #35

merged 2 commits into from Sep 3, 2014

Conversation

underscorgan
Copy link
Contributor

No description provided.

hunner and others added 2 commits August 30, 2014 19:36
@hunner @zshahan
commit cleanup.
4c37e41
Merge branch 'setenv-fix' of github.com:zshahan/puppetlabs-tomcat int…
9260fa9 
…o setenv_fix

Conflicts:
	manifests/setenv/entry.pp
	spec/defines/setenv/entry_spec.rb
@underscorgan
Copy link
Contributor Author

Closes #17

underscorgan pushed a commit that referenced this pull request Sep 3, 2014
Merge pull request #35 from mhaskel/setenv_fix
6365a65 
Setenv fix
@underscorgan underscorgan merged commit 6365a65 into puppetlabs:master Sep 3, 2014
@underscorgan underscorgan deleted the setenv_fix branch September 5, 2014 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bugfix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@underscorgan @jordanbreen28 @hunner