Diffusion puppet 7f9c9e1089c4

Merge branch 'next'
7f9c9e1089c4Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

next: (#7101) Fix template error messages in Ruby 1.8.5 (#3420) Nagios "name" attribute does not output correctly (#4487) When setting environment on a host, ensure it is a string. add test for ticket 7101 add test for ticket 7101 (#7220) Add the ability to "inherit" options. (#6487) Add some testing for OS X version support in DirectoryService provider (#6487) Directoryservice provider will fail in future OS releases (#6368) Make the File type autorequire its nearest ancestor directory

Details

Provenance

Max Martin <max@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU68c82d4d8b75: Merge branch '2.7.next' into next
rPUa80ff1ad0d25: Merge branch 'ticket/master/7101-template-compilation'

Branches

Unknown

Tags

Unknown

References

tag: Iteration-2011-04-27-master

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU7f9c9e1089c4: Merge branch 'next' (authored by Max Martin <max@puppetlabs.com>).Apr 27 2011, 10:28 PM

Merged Changes

68c82d4d8b75 Merge branch '2.7.next' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b12b55b6a2d Merge branch '2.6.next' into 2.7.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
32b13dad0619 Merge branch 'ticket/next/7101-template-compilation' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
ac0581f16ca1 (#7101) Fix template error messages in Ruby 1.8.5
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
361d6a3a6917 Merge branch 'tickets/2.6.next/3420' into 2.6.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
035240241d38 (#3420) Nagios "name" attribute does not output correctly
Author
Jim Pirzyk <jim+puppet@pirzyk.org>
Browse Repository
No Builds
No Audits
ddc4e1486892 Merge branch 'tickets/2.6.next/4487' into 2.6.next
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
f656818bcd7c (#4487) When setting environment on a host, ensure it is a string.
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
74498afecdc0 add test for ticket 7101
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
2cce32658855 add test for ticket 7101
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits
ced9f553772d Merge branch 'tickets/2.7.next/7220' into 2.7.next
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
9329a1f33b4d (#7220) Add the ability to "inherit" options.
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
1ee6f949416a Merge branch 'tickets/2.6.x/6487-help-directoryservice-provider-work-on-future…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
c306db2037a1 (#6487) Add some testing for OS X version support in DirectoryService provider
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
0008b630f8bd (#6487) Directoryservice provider will fail in future OS releases
Author
Gary Larizza <ccshots@gmail.com>
Browse Repository
No Builds
No Audits
89620ab51997 Merge branch 'tickets/2.7.next/6368-files-autorequire-nearest-ancestor…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
f21162bdbae5 (#6368) Make the File type autorequire its nearest ancestor directory
Author
Ian Ward Comfort <icomfort@stanford.edu>
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

lib/

puppet/

interface/

action_builder.rb

provider/

nameservice/

directoryservice.rb

rails/

type/

spec/

unit/

interface/

action_builder_spec.rb

provider/

nameservice/

directoryservice_spec.rb

rails/

type/

rPU7f9c9e1089c4

lib/puppet/interface/action.rb

Loading...

lib/puppet/interface/action_builder.rb

Loading...

lib/puppet/provider/naginator.rb

Loading...

lib/puppet/provider/nameservice/directoryservice.rb

Loading...

lib/puppet/rails/host.rb

Loading...

lib/puppet/type/file.rb

Loading...

spec/unit/interface/action_builder_spec.rb

Loading...

spec/unit/interface/action_spec.rb

Loading...

spec/unit/provider/nameservice/directoryservice_spec.rb

Loading...

spec/unit/rails/host_spec.rb

Loading...

spec/unit/type/file_spec.rb

Loading...