Diffusion puppet 7f826bfc1352

Merge branch '2.7.x'
7f826bfc1352Unpublished
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: (#7502) Fixed parser spec for ruby 1.8.5 (#7507) Add more 1.9 filters (#6395) Add extpuppet help, eval, and interfaces maint: move trap call to Signal so we can stub it for specs Updated CHANGELOG for 2.7.0rc3 (#7259) Remove ActiveRecord requirement from indirector face spec (#7259) Do not try to load all Terminus classes when configuring the Indirector Adding a sleep state post starting master

Details

Provenance

Matt Robinson <matt@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUe0b63a27382b: Merge branch 'ticket/2.7.x/7507' into 2.7.x
rPU25b967559dfa: Merge branch 'vcsrepo'

Branches

Unknown

Tags

Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPU7f826bfc1352: Merge branch '2.7.x' (authored by Matt Robinson <matt@puppetlabs.com>).May 24 2011, 8:16 AM

Merged Changes

e0b63a27382b Merge branch 'ticket/2.7.x/7507' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
181098ba045e (#7502) Fixed parser spec for ruby 1.8.5
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
9c3bedd6b4d5 (#7507) Add more 1.9 filters
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
eeeab02fd97a Merge branch '2.7.next' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
99bf07e76bab Merge branch 'feature/2.7.next/6395_envpuppet' into 2.7.next
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
f037662edfd3 (#6395) Add extpuppet help, eval, and interfaces
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
be2f20899d76 Merge branch 'ticket/2.7.x/maint-stub_trap' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
3682025065c4 maint: move trap call to Signal so we can stub it for specs
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
0c9439d1ff05 Merge branch '2.7.x' into 2.7.next
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
fc0add14616f Updated CHANGELOG for 2.7.0rc3
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
a622c95776d0 Merge branch 'tickets/2.7.x/7259' into 2.7.x
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
83c756367ef4 (#7259) Remove ActiveRecord requirement from indirector face spec
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
aad2fd780b51 (#7259) Do not try to load all Terminus classes when configuring the Indirector
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
3378841a230c Adding a sleep state post starting master
Author
Dominic Maraglia <dmaraglia@gmail.com>
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

ext/

lib/

puppet/

application/

type/

spec/

integration/

parser/

monkey_patches/

disable_signal_trap.rb

unit/

application/

indirector/

facts/

parser/

resource_spec.rb

rPU7f826bfc1352

CHANGELOG

Loading...

ext/envpuppet

Loading...

lib/puppet/application/device.rb

Loading...

lib/puppet/type/file.rb

Loading...

spec/integration/parser/parser_spec.rb

Loading...

spec/monkey_patches/disable_signal_trap.rb

Loading...

spec/spec_helper.rb

Loading...

spec/unit/application/device_spec.rb

Loading...

spec/unit/indirector/facts/couch_spec.rb

Loading...

spec/unit/parser/resource_spec.rb

Loading...