Merge branch '2.7.x' into 2.7.next
f9e44f041b3fUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x' into 2.7.next

Details

Provenance

Pieter van de Bruggen <pieter@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUc8b294a0b0a1: Merge branch 'tickets/2.7.x/7507' into 2.7.x
rPU99d437d2bbc2: Merge branch 'ticket/2.7.next/7114' into 2.7.next

Branches

Unknown

Tags

Unknown

Event Timeline

Pieter van de Bruggen <pieter@puppetlabs.com> committed rPUf9e44f041b3f: Merge branch '2.7.x' into 2.7.next (authored by Pieter van de Bruggen <pieter@puppetlabs.com>).May 17 2011, 11:50 PM

Merged Changes

c8b294a0b0a1 Merge branch 'tickets/2.7.x/7507' into 2.7.x
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
d972ceaa8a79 (#7507) Add more filters for Ruby 1.9 spec failures
Author
Pieter van de Bruggen <pieter@puppetlabs.com>
Browse Repository
No Builds
No Audits
5457c70a66ef Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
9da1454e71b8 (#7507) Add ability to filter Ruby 1.9 spec failures
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
47e4ac948504 (#7507) Fix when_invoked action specs in Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
009c961ec6e7 Merge branch 'ticket/2.7.x/7297' into 2.7.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
809b6fe5b105 (#7297) Fix Puppet::Resource#to_manifest in Ruby 1.9
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
797da049bf8f Merge branch 'ticket/2.7.x/7298' into 2.7.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
3197e21069e7 (#7298) require 'English' to provide $CHILD_STATUS in Ruby 1.9
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8f58db918835 Merge branch 'ticket/2.7.x/7291-ruby19-fixes' into 2.7.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
48923af0954e (#7291) Fix issues with instance_methods in Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
68065ff4bb09 (#7291) Fixed ascii problem with Ruby 1.9.2
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
1abb7c086f2d (#7291) Fix Ruby 1.9 face failures
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
615946619b71 (#7291) The 'script' version of actions needs options argument
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (75)

Path

Size

lib/

puppet/

face/

interface/

network/

util/

spec/

integration/

application/

network/

server/

provider/

service/

util/

rdoc/

lib/

puppet/

face/

huzzah.rb

version_matching.rb

unit/

application/

indirector/

facts/

report/

resource/

interface/

action_builder_spec.rb

action_manager_spec.rb

action_spec.rb

interface_spec.rb

network/

handler/

fileserver_spec.rb

http/

mongrel/

rest_spec.rb

mongrel_spec.rb

webrick/

rest_spec.rb

parser/

ast/

function_spec.rb

selector_spec.rb

compiler_spec.rb

functions/

create_resources_spec.rb

inline_template_spec.rb

shellquote_spec.rb

template_spec.rb

resource_spec.rb

provider/

mount/

package/

service/

user/

user_role_add_spec.rb

zpool/

resource/

ssl/

certificate_authority/

transaction/

type/

util/

network_device/

cisco/

transport/

queue/

rdoc/

rPUf9e44f041b3f

View Options

lib/puppet/face/certificate.rb

View Options

lib/puppet/face/resource.rb

View Options

lib/puppet/interface/action.rb

View Options

lib/puppet/interface/action_builder.rb

View Options

lib/puppet/interface/option_builder.rb

View Options

lib/puppet/network/client.rb

View Options

lib/puppet/network/format.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/selinux.rb

View Options

spec/integration/application/doc_spec.rb

View Options

spec/integration/network/formats_spec.rb

View Options

spec/integration/network/server/mongrel_spec.rb

View Options

spec/integration/node_spec.rb

View Options

spec/integration/provider/package_spec.rb

View Options

spec/integration/provider/service/init_spec.rb

View Options

spec/integration/transaction_spec.rb

View Options

spec/integration/util/file_locking_spec.rb

View Options

spec/integration/util/rdoc/parser_spec.rb

View Options

spec/lib/puppet/face/huzzah.rb

View Options

spec/lib/puppet/face/version_matching.rb

View Options

spec/unit/application/cert_spec.rb

View Options

spec/unit/application/face_base_spec.rb

View Options

spec/unit/application/facts_spec.rb

View Options

spec/unit/application/resource_spec.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/indirector/facts/couch_spec.rb

View Options

spec/unit/indirector/ldap_spec.rb

View Options

spec/unit/indirector/report/yaml_spec.rb

View Options

spec/unit/indirector/resource/ral_spec.rb

View Options

spec/unit/indirector/terminus_spec.rb

View Options

spec/unit/interface/action_builder_spec.rb

View Options

spec/unit/interface/action_manager_spec.rb

View Options

spec/unit/interface/action_spec.rb

View Options

spec/unit/interface_spec.rb

View Options

spec/unit/network/handler/fileserver_spec.rb

View Options

spec/unit/network/http/mongrel/rest_spec.rb

View Options

spec/unit/network/http/mongrel_spec.rb

View Options

spec/unit/network/http/webrick/rest_spec.rb

View Options

spec/unit/parser/ast/function_spec.rb

View Options

spec/unit/parser/ast/selector_spec.rb

View Options

spec/unit/parser/compiler_spec.rb

View Options

spec/unit/parser/functions/create_resources_spec.rb

View Options

spec/unit/parser/functions/inline_template_spec.rb

View Options

spec/unit/parser/functions/shellquote_spec.rb

View Options

spec/unit/parser/functions/template_spec.rb

View Options

spec/unit/parser/resource_spec.rb

View Options

spec/unit/provider/mount/parsed_spec.rb

View Options

spec/unit/provider/package/macports_spec.rb

View Options

spec/unit/provider/service/init_spec.rb

View Options

spec/unit/provider/service/src_spec.rb

View Options

spec/unit/provider/user/user_role_add_spec.rb

View Options

spec/unit/provider/zpool/solaris_spec.rb

View Options

spec/unit/resource/status_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/simple_graph_spec.rb

View Options

spec/unit/ssl/certificate_authority/interface_spec.rb

View Options

spec/unit/ssl/host_spec.rb

View Options

spec/unit/transaction/event_spec.rb

View Options

spec/unit/type/augeas_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/type/group_spec.rb

View Options

spec/unit/type/resources_spec.rb

View Options

spec/unit/type/schedule_spec.rb

View Options

spec/unit/util/autoload_spec.rb

View Options

spec/unit/util/cacher_spec.rb

View Options

spec/unit/util/file_locking_spec.rb

View Options

spec/unit/util/log_spec.rb

View Options

spec/unit/util/network_device/cisco/device_spec.rb

View Options

spec/unit/util/network_device/transport/ssh_spec.rb

View Options

spec/unit/util/pson_spec.rb

View Options

spec/unit/util/queue/stomp_spec.rb

View Options

spec/unit/util/rdoc/parser_spec.rb

View Options

spec/unit/util/rdoc_spec.rb

View Options

spec/unit/util/selinux_spec.rb

Merge branch '2.7.x' into 2.7.nextf9e44f041b3fUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (75)

rPUf9e44f041b3f

lib/puppet/face/certificate.rb

lib/puppet/face/resource.rb

lib/puppet/interface/action.rb

lib/puppet/interface/action_builder.rb

lib/puppet/interface/option_builder.rb

lib/puppet/network/client.rb

lib/puppet/network/format.rb

lib/puppet/resource.rb

lib/puppet/util.rb

lib/puppet/util/selinux.rb

spec/integration/application/doc_spec.rb

spec/integration/network/formats_spec.rb

spec/integration/network/server/mongrel_spec.rb

spec/integration/node_spec.rb

spec/integration/provider/package_spec.rb

spec/integration/provider/service/init_spec.rb

spec/integration/transaction_spec.rb

spec/integration/util/file_locking_spec.rb

spec/integration/util/rdoc/parser_spec.rb

spec/lib/puppet/face/huzzah.rb

spec/lib/puppet/face/version_matching.rb

spec/unit/application/cert_spec.rb

spec/unit/application/face_base_spec.rb

spec/unit/application/facts_spec.rb

spec/unit/application/resource_spec.rb

spec/unit/application_spec.rb

spec/unit/indirector/facts/couch_spec.rb

spec/unit/indirector/ldap_spec.rb

spec/unit/indirector/report/yaml_spec.rb

spec/unit/indirector/resource/ral_spec.rb

spec/unit/indirector/terminus_spec.rb

spec/unit/interface/action_builder_spec.rb

spec/unit/interface/action_manager_spec.rb

spec/unit/interface/action_spec.rb

spec/unit/interface_spec.rb

spec/unit/network/handler/fileserver_spec.rb

spec/unit/network/http/mongrel/rest_spec.rb

spec/unit/network/http/mongrel_spec.rb

spec/unit/network/http/webrick/rest_spec.rb

spec/unit/parser/ast/function_spec.rb

spec/unit/parser/ast/selector_spec.rb

spec/unit/parser/compiler_spec.rb

spec/unit/parser/functions/create_resources_spec.rb

spec/unit/parser/functions/inline_template_spec.rb

spec/unit/parser/functions/shellquote_spec.rb

spec/unit/parser/functions/template_spec.rb

spec/unit/parser/resource_spec.rb

spec/unit/provider/mount/parsed_spec.rb

spec/unit/provider/package/macports_spec.rb

spec/unit/provider/service/init_spec.rb

spec/unit/provider/service/src_spec.rb

spec/unit/provider/user/user_role_add_spec.rb

spec/unit/provider/zpool/solaris_spec.rb

spec/unit/resource/status_spec.rb

spec/unit/resource_spec.rb

spec/unit/simple_graph_spec.rb

spec/unit/ssl/certificate_authority/interface_spec.rb

spec/unit/ssl/host_spec.rb

spec/unit/transaction/event_spec.rb

spec/unit/type/augeas_spec.rb

spec/unit/type/file_spec.rb

spec/unit/type/group_spec.rb

spec/unit/type/resources_spec.rb

spec/unit/type/schedule_spec.rb

spec/unit/util/autoload_spec.rb

spec/unit/util/cacher_spec.rb

spec/unit/util/file_locking_spec.rb

spec/unit/util/log_spec.rb

spec/unit/util/network_device/cisco/device_spec.rb

spec/unit/util/network_device/transport/ssh_spec.rb

spec/unit/util/pson_spec.rb

spec/unit/util/queue/stomp_spec.rb

Merge branch '2.7.x' into 2.7.next
f9e44f041b3fUnpublished
Actions