Skip to content

master to 4.12.x #595

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

Merged
merged 17 commits into from
Apr 15, 2016
Merged

master to 4.12.x #595

merged 17 commits into from
Apr 15, 2016

Conversation

tphoney
Copy link
Contributor

@tphoney tphoney commented Apr 15, 2016

No description provided.

derekmceachern and others added 17 commits March 24, 2016 14:23
`file_line` type: During validation, do not require `line` attribute if:
* `ensure` is `absent`,
* `match` is not empty,
* and `match_for_absence` is `true`.

Also update `spec` tests to reflect this.
catch StandardError rather than the gratuitous Exception
This removes much of the assorted cruft that accumulated in the
unmanaged files and moves the remaining necessary parts to
spec_helper_local.
This removes the failing test special casing for puppet 4.
Psych::SyntaxError is a RuntimeException. This still needs to
catch that. This was uncovered by the recent move to catch StandardError
rather than the catchall Exception that was here before.
Multiple updates to stdlib and its testsuite
…_test_typo

MODULES-3201 - Fixed typo 'absense' to 'absence'
…idate-to-not-require-line-when-matching-for-absence

[MODULES-2370] file_line.rb: Fix `line` attribute validation
85d5ead Updated the concat function so that it wouldn't modify the
original array. A side-effect of this change is that it now always calls
`Array()` on the second argument. If thit is a Hash, this results in
`to_a` being called on the hash, which converts it to an array or
tuples. This is undesired.

Update the behaviour so that it doesn't (indirectly) call `to_a` on
anything, instead test for the type of the argument, wrapping it in an
array if it's not already an array.
(MODULES-3246) Fix concat with Hash arguments.
Add support for regular expressions to delete
@HelenCampbell HelenCampbell merged commit d9f6538 into puppetlabs:4.12.x Apr 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants