summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-15Merge pull request #402 from cyberious/4.6.xMorgan Haskel
Merge 4.5.x into 4.6.x
2015-01-14Merge branch '4.5.x' into 4.6.xTravis Fields
Conflicts: CHANGELOG.md
2015-01-14Merge pull request #401 from cyberious/FM-2131Colleen Murphy
FM-2131 Move to non temp directory for factor_dot_d
2015-01-14Prepare for 4.5.1 releaseTravis Fields
2015-01-14FM-2130 Move cache file to non temp directoryTravis Fields
2015-01-14Merge pull request #398 from puppetlabs/masterHunter Haugen
Pull in RSpec 3.0 fixes.
2015-01-13Merge pull request #397 from cyberious/4.6.xColleen Murphy
4.6.x
2015-01-13Prep for 4.6.0 STDLIB releaseTravis Fields
2015-01-13Merge pull request #396 from hunner/change_eachTravis Fields
Change all to each
2015-01-13Change all to eachHunter Haugen
The existence of this directory is behavior for each test, but will also stop rspec 3 from complaining.
2015-01-13Merge branch 'master' into 4.5.xTravis Fields
2015-01-13Merge pull request #395 from cyberious/FM-2130Hunter Haugen
FM-2130 Move cache file to non temp directory
2015-01-13FM-2130 Move cache file to non temp directoryTravis Fields
2015-01-08Merge pull request #382 from hunner/fix_typeTravis Fields
(MODULES-1473) Deprecate type() function for new parser
2015-01-07(MODULES-1473) Deprecate type() function for new parserHunter Haugen
The `type()` function will cease to work on the new parser because 'type' is a reserved keyword. The `type3x()` function may be used to continue similar functionality, but will be deprecated in favor of the built-in typing system. The `type_of()` function has been included to introspect types in the new parser.
2015-01-02Merge pull request #336 from mklette/masterTravis Fields
ensure_resource: be more verbose in debug mode
2014-12-29Merge pull request #394 from cmurphy/masterMorgan Haskel
Add IntelliJ files to the ignore list
2014-12-29Add IntelliJ files to the ignore listColleen Murphy
2014-12-20Merge pull request #391 from petems/update_readmeHunter Haugen
Update README
2014-12-20README fixes for recent mergesPeter Souter
* (MODULES-444) Update README for concat changes * (MODULES-1582) Update `validate_cmd` readme * Plus some Whitespace fixes
2014-12-19Merge pull request #393 from cyberious/DeleteDocUpdatesHunter Haugen
Update docs to reflect new behavior of delete function taking array in second argument
2014-12-19Update docs to reflect new behavior of delete function taking array in ↵Travis Fields
second argument
2014-12-19Merge pull request #392 from cyberious/MOD-1606Hunter Haugen
MODULES-1606 add ability to pass array to delete for items to delete
2014-12-19MODULES-1606 add ability to pass array to delete for items to deleteTravis Fields
2014-12-18Merge pull request #389 from mhaskel/fix_test_374Travis Fields
Fix bad check in test
2014-12-18Fix bad check in testMorgan Haskel
2014-12-18Merge pull request #388 from mhaskel/merge_4.5.x_into_masterHunter Haugen
Merge 4.5.x into master
2014-12-18Merge pull request #377 from petems/MODULES-1582-improve_validate_cmdHunter Haugen
(MODULES-1582) File location placeholder
2014-12-18(MODULES-1582) Improve % detectionPeter Souter
Avoids any validate commands that have %'s in them other than "... % ..."
2014-12-18(MODULES-1582) Specs for the new % placeholderPeter Souter
These specs are pretty much the same as the originals, but now check that the output has the correct replacement for file location
2014-12-18(MODULES-1582) Initial spike for % placeholderPeter Souter
This simply `gsub`'s the file path into where the % placeholder is.
2014-12-17Merge pull request #372 from ↵Morgan Haskel
poikilotherm/feature/master/validate_absolute_path_allow_arrays Allow array of pathes in validate_absolute_path
2014-12-17Merge pull request #368 from rfugina/basenameMorgan Haskel
Basename implementation
2014-12-17Added basename() based on Ruby's File.basenameRob Fugina
Based on dirname code. Includes RSpec tests and docs.
2014-12-17Merge pull request #374 from petems/MODULES-444-add_concat_multipleHunter Haugen
MODULES-444-Add concat multiple
2014-12-16Merge remote-tracking branch 'upstream/4.5.x' into merge_4.5.x_into_masterMorgan Haskel
Conflicts: metadata.json
2014-12-16Merge pull request #387 from hunner/remove_match_lineMorgan Haskel
Remove line match validation
2014-12-16Merge pull request #386 from jbondpdx/4.5.xMorgan Haskel
DOC-1095: edit file_line resource, match parameter
2014-12-16Remove line match validationHunter Haugen
The `match` attribute was validated to match `line`, except that in many cases (even the example given in the docs) a user would want to match a line entirely different from the new line. See comments on the original commit https://github.com/puppetlabs/puppetlabs-stdlib/commit/a06c0d8115892a74666676b50d4282df9850a119 and ask https://ask.puppetlabs.com/question/14366/file_line-resource-match-problems/ for further examples of confusion.
2014-12-16DOC-1095: edit file_line resource, match parameterjbondpdx
Was unclear and not accurate; rewrote the parameter, moved file_line from function list to resource section, added missing parameters for this resource.
2014-12-16Merge pull request #384 from mhaskel/doc_fixes_from_masterColleen Murphy
Doc fixes from master
2014-12-16Added a note that stdlib no longer ships with PE 3.7+jbondpdx
Users didn't realize we stopped shipping stdlib module with PE. I added this information to the stdlib readme.
2014-12-16FM-1523: Added module summary to metadata.jsonjbondpdx
2014-12-16Merge pull request #373 from jbondpdx/stdlib-readme-fixMorgan Haskel
Add to Readme: Stdlib no longer ships with PE
2014-12-16Merge pull request #370 from jbondpdx/masterMorgan Haskel
FM-1523: Added module summary to metadata.json
2014-12-15Merge pull request #383 from mhaskel/doc_updateTravis Fields
Update README for updated member() functionality
2014-12-15Update README for updated member() functionalityMorgan Haskel
2014-12-15Merge pull request #381 from mhaskel/4.5.0-prepTravis Fields
4.5.0 prep
2014-12-154.5.0 prepMorgan Haskel
2014-12-09Merge pull request #376 from cmurphy/masterMorgan Haskel
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md