HomePhorge

Merge remote-tracking branch 'upstream/stable'
fe77a18fbb24Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

  • upstream/stable: (maint) Fix rdoc generator for Ruby 2.1.0 (maint) Fix a comment. (maint) Fix can't modify frozen Symbol error on Ruby 2.1.0 (PUP-1389) Embed the extra NULL within the string (PUP-1389) Simplify logic for appending extra NULL (PUP-1389) ReplaceFile to FFI / move wide_string (PUP-1389) Ensure wide strings have double null terminators PUP-1322 Do not fail hard on unparseable files (maint) Correct documentation of each function (maint) Fix acceptance test for scheduled_task deletion

Conflicts:
lib/puppet/parser/functions/each.rb

Event Timeline

Iristyle <Iristyle@github> committed rPUfe77a18fbb24: Merge remote-tracking branch 'upstream/stable' (authored by Iristyle <Iristyle@github>).Jan 23 2014, 12:10 AM

Merged Changes