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

merge Master back up to 3.1.x #159

Merged
merged 8 commits into from Jun 3, 2014
Merged

merge Master back up to 3.1.x #159

merged 8 commits into from Jun 3, 2014

Conversation

cyberious
Copy link
Contributor

New parameter to set log_file

@cyberious cyberious mentioned this pull request Jun 3, 2014
@@ -26,6 +27,7 @@
validate_string($config_template)
validate_bool($disable_monitor)
validate_absolute_path($driftfile)
if $logfile { validate_absolute_path($logfile) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I'm cool with this :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explain? I did run our current system tests against it for our default and ubuntu-server 12042

apenney pushed a commit that referenced this pull request Jun 3, 2014
merge Master back up to 3.1.x
@apenney apenney merged commit aa14369 into puppetlabs:3.1.x Jun 3, 2014
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.

None yet

3 participants