Merge branch 'master' into puppet-4
3d328f51016eUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into puppet-4

Conflicts:
lib/puppet/defaults.rb

Details

Provenance

Adrien Thebo <git@somethingsinistral.net>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU665ddb01c9c7: Merge pull request #2924 from adrienthebo/maint/puppet-4/remove-unused-validater
rPU3eb2a8f9460d: Merge pull request #2925 from Sharpie/pup-877-deprecate-masterlog

Branches

Unknown

Tags

Unknown

Event Timeline

Adrien Thebo <git@somethingsinistral.net> committed rPU3d328f51016e: Merge branch 'master' into puppet-4 (authored by Adrien Thebo <git@somethingsinistral.net>).Jul 31 2014, 6:58 PM

Merged Changes

3eb2a8f9460d Merge pull request #2925 from Sharpie/pup-877-deprecate-masterlog
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
73f96d962f0d (PUP-877) Deprecate masterlog setting
Author
Charlie Sharpsteen <chuck@puppetlabs.com>
Browse Repository
No Builds
No Audits
896c44998e9d Merge pull request #2854 from highb/fix/master/pup-2912_build_no_symlinks
Author
Anderson Mills <anderson@puppetlabs.com>
Browse Repository
No Builds
No Audits
df7acc7ba46f Merge pull request #2886 from blkperl/facts_should_be_debug
Author
Adrien Thebo <git@somethingsinistral.net>
Browse Repository
No Builds
No Audits
ef915edf68c8 (PUP-2952) Puppet should only log facts in debug mode
Author
William Van Hevelingen <blkperl@cat.pdx.edu>
Browse Repository
No Builds
No Audits
a310f7994581 (PUP-2912) Builder/unpacker spec tests
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
2b76f86351e5 (PE-2912) Error on symlink in module install
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits
40fa2323d28f (PUP-2912) PMT Build symlink exception
Author
Brandon High <brandon.high@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

lib/

puppet/

indirector/

facts/

facter.rb

module_tool/

applications/

builder.rb

unpacker.rb

spec/

unit/

module_tool/

applications/

builder_spec.rb

unpacker_spec.rb

rPU3d328f51016e

View Options

lib/puppet/indirector/facts/facter.rb

View Options

lib/puppet/module_tool/applications/builder.rb

View Options

lib/puppet/module_tool/applications/unpacker.rb

View Options

spec/unit/module_tool/applications/builder_spec.rb

View Options

spec/unit/module_tool/applications/unpacker_spec.rb

Merge branch 'master' into puppet-43d328f51016eUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (5)

rPU3d328f51016e

lib/puppet/indirector/facts/facter.rb

lib/puppet/module_tool/applications/builder.rb

lib/puppet/module_tool/applications/unpacker.rb

spec/unit/module_tool/applications/builder_spec.rb

spec/unit/module_tool/applications/unpacker_spec.rb

Merge branch 'master' into puppet-4
3d328f51016eUnpublished
Actions