Merge branch '2.7.x'
b13427b56d85Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x'

Conflicts:
lib/puppet/type/file/source.rb
spec/unit/resource/catalog_spec.rb

Details

Provenance

Nick Lewis <nick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU8baa4897e777: Merge branch '2.6.x' into 2.7.x
rPU043c3e87c882: Merge branch 'feature/master/8272-windows_service_support'

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPUb13427b56d85: Merge branch '2.7.x' (authored by Nick Lewis <nick@puppetlabs.com>).Jul 26 2011, 2:02 AM

Merged Changes

8baa4897e777 Merge branch '2.6.x' into 2.7.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0157bf3ee2d5 Merge branch 'ticket/2.6.x/8596' into 2.6.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
fb2ffd6879f4 (#8596) Detect resource alias conflicts when titles do not match
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
62b6b0c43880 Merge branch 'tickets/2.7.x/7293' into 2.7.x
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
0366b1856489 (#7293) Set default format for SSL-related faces.
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
cc2c3edbb690 (Maint.) Unquoting HEREDOCs.
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
fc420008b75a Merge branch '2.7rc' into 2.7.x
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
e1a4fed4f3bd Updated CHANGELOG for 2.7.2rc2
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
c7361629dff0 Merge branch 'ticket/2.6.x/8418-inspect_respect_run_mode' into 2.6.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
89c021cac52a (#8418) Fix inspect app to have the correct run_mode
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
3165364e20fc maint: Adding logging to include environment when source fails
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
f484851b7528 maint: Add debug logging when the master receives a report
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d19fc2b34ddb Merge branch 'tickets/2.7.x/7266' into 2.7.x
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
10e05ad302d1 (#7266) Move Certificate option validation into face.
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
d522b0b82428 maint: Fix Face testing bug 1.9.2 revealed.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
29a25abe7a6e Merge branch 'refactor/2.7.x/8561-and-7290-improved-option-handling' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
ae360034c07f (#7290) Update indirected Faces to avoid unknown options.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
88e9cd2138e9 maint: don't print inside action implementations.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
82e5fa9561e2 (#8561, #7290) Implement the option contract fully.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
77441be2299b (#8561) Unify validation and modification of action arguments.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
69b4e70ac2fa (#7290) Fail on unknown options.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
6bec2df0860b (#8561) Use canonical names for options to actions.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
feec7b3df713 Merge branch 'feature/2.7.x/7184-better-action-loading' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
532c4f37e4f8 (#7184) Load the core of obsolete versions of Faces.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
2cd3bc47993f (#7184) Find actions bound to other versions of Faces.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
1e0655e6bdbc (#7184) Centralize "find action for face" into Puppet::Face
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
039661156116 maint: better error reporting when test fails
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
564a6031a394 Merge branch 'ticket/master/8301-redhat-spec-cleanup' into 2.7rc
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ec0804b0ff2 (#8301) Red Hat spec file for 2.7.2rc1 won't work
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
2263be6f190e (#5108) Update service type docs for new hasstatus default
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits

Changes (30)

Path

Size

CHANGELOG

conf/

redhat/

puppet.spec

lib/

puppet/

application/

face/

certificate_request.rb

certificate_revocation_list.rb

indirector/

report/

interface/

resource/

type/

file/

source.rb

service.rb

spec/

lib/

puppet/

face/

unit/

application/

face/

indirector/

report/

interface/

face_collection_spec.rb

interface_spec.rb

resource/

catalog_spec.rb

rPUb13427b56d85

View Options

CHANGELOG

View Options

conf/redhat/puppet.spec

View Options

lib/puppet/application/certificate.rb

View Options

lib/puppet/application/face_base.rb

View Options

lib/puppet/application/inspect.rb

View Options

lib/puppet/face/certificate.rb

View Options

lib/puppet/face/certificate_request.rb

View Options

lib/puppet/face/certificate_revocation_list.rb

View Options

lib/puppet/indirector/face.rb

View Options

lib/puppet/indirector/report/processor.rb

View Options

lib/puppet/interface.rb

View Options

lib/puppet/interface/action.rb

View Options

lib/puppet/interface/face_collection.rb

View Options

lib/puppet/resource/catalog.rb

View Options

lib/puppet/type/file/source.rb

View Options

lib/puppet/type/service.rb

View Options

spec/lib/puppet/face/1.0.0/huzzah.rb

View Options

spec/lib/puppet/face/huzzah.rb

View Options

spec/lib/puppet/face/huzzah/obsolete.rb

View Options

spec/unit/application/face_base_spec.rb

View Options

spec/unit/application/inspect_spec.rb

View Options

spec/unit/face/certificate_spec.rb

View Options

spec/unit/indirector/face_spec.rb

View Options

spec/unit/indirector/report/processor_spec.rb

View Options

spec/unit/interface/action_spec.rb

View Options

spec/unit/interface/face_collection_spec.rb

View Options

spec/unit/interface_spec.rb

View Options

spec/unit/resource/catalog_spec.rb

Merge branch '2.7.x'b13427b56d85UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (30)

rPUb13427b56d85

CHANGELOG

conf/redhat/puppet.spec

lib/puppet/application/certificate.rb

lib/puppet/application/face_base.rb

lib/puppet/application/inspect.rb

lib/puppet/face/certificate.rb

lib/puppet/face/certificate_request.rb

lib/puppet/face/certificate_revocation_list.rb

lib/puppet/indirector/face.rb

lib/puppet/indirector/report/processor.rb

lib/puppet/interface.rb

lib/puppet/interface/action.rb

lib/puppet/interface/face_collection.rb

lib/puppet/resource/catalog.rb

lib/puppet/type/file/source.rb

lib/puppet/type/service.rb

spec/lib/puppet/face/1.0.0/huzzah.rb

spec/lib/puppet/face/huzzah.rb

spec/lib/puppet/face/huzzah/obsolete.rb

spec/unit/application/face_base_spec.rb

spec/unit/application/inspect_spec.rb

spec/unit/face/certificate_spec.rb

spec/unit/indirector/face_spec.rb

spec/unit/indirector/report/processor_spec.rb

spec/unit/interface/action_spec.rb

spec/unit/interface/face_collection_spec.rb

spec/unit/interface_spec.rb

spec/unit/resource/catalog_spec.rb

Merge branch '2.7.x'
b13427b56d85Unpublished
Actions