Diffusion puppet c71690a3777a

Merge branch '2.7.x'
c71690a3777aUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

2.7.x: Add Puppet::Util::Platform to abstract platform checks Don't use features to check for color in logging (#14288) gem provider should tolerate bad lines.

Conflicts:
lib/puppet/provider/package/gem.rb
lib/puppet/util.rb

Details

Provenance

Patrick Carlisle <patrick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU71b09e928b12: Merge pull request #744 from pcarlisle/maint/2.7.x/ansicolor-recursion
rPUf0389e6921e1: Merge pull request #743 from…

Branches

Unknown

Tags

Unknown

Event Timeline

Patrick Carlisle <patrick@puppetlabs.com> committed rPUc71690a3777a: Merge branch '2.7.x' (authored by Patrick Carlisle <patrick@puppetlabs.com>).May 8 2012, 11:05 PM

Changes (10)

Path

Size

lib/

puppet/

feature/

provider/

package/

util/

spec/

fixtures/

unit/

provider/

package/

gem/

line-with-1.8.5-warning

unit/

provider/

package/

util/

log/

destinations_spec.rb

rPUc71690a3777a

lib/puppet/feature/ansicolor.rb

Loading...

lib/puppet/provider/package/gem.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/colors.rb

Loading...

lib/puppet/util/platform.rb

Loading...

spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning

Loading...

spec/unit/provider/package/gem_spec.rb

Loading...

spec/unit/util/colors_spec.rb

Loading...

spec/unit/util/log/destinations_spec.rb

Loading...