Merge 2.7.x into master.
985c44b6adffUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge 2.7.x into master.

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Details

Provenance

Daniel Pittman <daniel@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU3be6809f9d6b: Merge pull request #631 from kbarber/ticket/2.7.x/13651-magenta_not_purple
rPUce1e5555a847: Merge branch 'cprice-puppet-bug/master/14200-help-face-bad-docs'

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU985c44b6adff: Merge 2.7.x into master. (authored by Daniel Pittman <daniel@puppetlabs.com>).Apr 29 2012, 5:50 AM

Merged Changes

3be6809f9d6b Merge pull request #631 from kbarber/ticket/2.7.x/13651-magenta_not_purple
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
34da6f7d1ef0 (#13651) Use magenta, not purple in Facter::Util::Colors
Author
Ken Barber <ken@bob.sh>
Browse Repository
No Builds
No Audits
727dce84dfe4 Merge branch 'fix/2.7.x/13956_fix_spec_tests_when_win32console_is_missing' into…
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
9b471101a7b4 (#13956) Fix failing spec tests
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
e50573985c2a Merge remote-tracking branch 'jeffmccune/fix/2.7.
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
7e92dcb057c6 Just change Puppet settings in tests, rather than stubbing.
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
ca313dce0c3e (maint) Fix destinations_spec failure on windows
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
a29822a94272 Merge pull request #714 from daniel-pittman/maint/2.7.x/fix-busted-colour-tests
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
cde3bee07717 Just change Puppet settings in tests, rather than stubbing.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
64348a0ea036 Merge remote-tracking branch 'joshcooper/ticket/2.7.x/13956-colorize-windows'…
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
f40cc71e8627 (#12392): Colorize console output on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

lib/

puppet/

defaults.rb

feature/

ansicolor.rb

util/

colors.rb

spec/

integration/

defaults_spec.rb

unit/

util/

colors_spec.rb

log/

destinations_spec.rb

log_spec.rb

rPU985c44b6adff

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/feature/ansicolor.rb

View Options

lib/puppet/util/colors.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/unit/util/colors_spec.rb

View Options

spec/unit/util/log/destinations_spec.rb

View Options

spec/unit/util/log_spec.rb

Merge 2.7.x into master.985c44b6adffUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (7)

rPU985c44b6adff

lib/puppet/defaults.rb

lib/puppet/feature/ansicolor.rb

lib/puppet/util/colors.rb

spec/integration/defaults_spec.rb

spec/unit/util/colors_spec.rb

spec/unit/util/log/destinations_spec.rb

spec/unit/util/log_spec.rb

Merge 2.7.x into master.
985c44b6adffUnpublished
Actions