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

Syntax fixes #24

Merged
merged 4 commits into from
Apr 20, 2012
Merged

Syntax fixes #24

merged 4 commits into from
Apr 20, 2012

Conversation

walterheck
Copy link

  • Fixed the test class
  • fixed the a2mod ruby file that had an erroneous 'end' in it
  • Adjusted some simple syntax to adhere to the style guide
  • name namevar's by name for file resources

jamtur01 added a commit that referenced this pull request Apr 20, 2012
@jamtur01
Merge pull request #24 from Tribily/syntax-fix
ddb8c6e 
Syntax fixes
@jamtur01 jamtur01 merged commit ddb8c6e into puppetlabs:master Apr 20, 2012
slamont referenced this pull request in slamont/puppetlabs-apache Apr 26, 2013
@hunner
Update changes based on hunner#24
651a696 
This commit:
- Causes `custom_fragment` to accept static content instead of template
  paths
- Removes `custom_fragement_params` because it is no longer used.
- Changes a little of the template logic to match the other fragments

Conflicts:
	manifests/vhost.pp
slamont referenced this pull request in slamont/puppetlabs-apache Apr 26, 2013
@hunner @slamont
Update changes based on hunner#24
956c299 
This commit:
- Causes `custom_fragment` to accept static content instead of template
  paths
- Removes `custom_fragement_params` because it is no longer used.
- Changes a little of the template logic to match the other fragments

Conflicts:
	manifests/vhost.pp
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.
3 participants
@walterheck @jamtur01 @GSPatton