Merge branch '2.7.x' into 2.7rc
af6636a71b79Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.7.x' into 2.7rc

Details

Provenance

Michael Stahnke <stahnma@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUeab8b7bb2ea6: Merge remote-tracking branch 'nicklewis/ticket/2.7.x/2744' into 2.7.x
rPU47c786e3ff82: Update CHANGELOG and packaging for 2.7.7 final

Branches

Unknown

Tags

Unknown

Event Timeline

Michael Stahnke <stahnma@puppetlabs.com> committed rPUaf6636a71b79: Merge branch '2.7.x' into 2.7rc (authored by Michael Stahnke <stahnma@puppetlabs.com>).Dec 1 2011, 2:45 AM

Merged Changes

eab8b7bb2ea6 Merge remote-tracking branch 'nicklewis/ticket/2.7.x/2744' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
d295fd9f5904 Merge branch '2.6.x' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
e4ee7947fd58 (#10739) Provide default subjectAltNames while bootstrapping master
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
2dedee62ba9b (#2744) Don't automatically enable show_diff in noop mode
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
39bf8cb4015a Merge pull request #223 from nicklewis/ticket/2.7.x/6907
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ef78358664a6 Give variables more descriptive names
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
cd3d4eaed36d maint: Rename xgenerate to add_dynamically_generated_resources
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
000a2d811c74 (#6907) Prefetch unsuitable providers
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
70114e97238e (#6907) Allow providers to be selected in the run they become suitable
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
a0ee5c70c900 maint: Fix incorrect whitespace
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
809ea0af9df5 Merge branch 'tickets/2.7.x/6697-default-service-provider-path-for-archlinux'…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
4e8a73c22421 Fix description in service provider test for FreeBSD
Author
Koen Wilde <koen@chillheid.nl>
Browse Repository
No Builds
No Audits
a2eab4fa328b (#6697) Set service provider default path to /etc/rc.d on Archlinux
Author
Koen Wilde <koen@chillheid.nl>
Browse Repository
No Builds
No Audits
e2aec6375fe0 Merge branch 'tickets/2.7.x/6335-allow-trailing-comma-in-parameterized-classes'…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
da75795e7b1a (#6335) Allow optional trailing comma in argument lists.
Author
Nan Liu <nan@puppetlabs.com>
Browse Repository
No Builds
No Audits
440ffac9a905 Merge branch 'tickets/2.7.x/7274-always-output-4-digit-modes' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
aef93cee8ae2 Merge branch 'tickets/2.7.x/8255-use-string-mode-creating-file-setting…
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
80304281b2b9 (#8255) Always use string modes when creating resources from FileSetting…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
c804346e74bc (#7274) Output 4-digit file modes in File type
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
bbf36c490360 Merge remote-tracking branch 'josh/ticket/2.7.x/10799-malformed-puppet-bat'…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
67e4e399480d Merge branch '2.6.x' into 2.7.x
Author
Joshua Harlan Lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
220f2bad2692 (#10799) Regexp escaping too much
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
4462eb5b4aa4 Merged 2.6.x into 2.7x
Author
Joshua Harlan Lifton <lifton@puppetlabs.com>
Browse Repository
No Builds
No Audits
5bb0fb7b484e Merge remote-tracking branch 'josh/ticket/2.7.x/10727-undefined-method…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
93aca5ad40eb maint: Fix failing specs for Windows exec provider
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
ad16096f97a5 Merge remote-tracking branch 'nicklewis/ticket/2.7rc/9671' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
8c307e880127 Merge remote-tracking branch 'josh/ticket/2.7.x/10614-handle-non-ntfs' into 2.7.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
23379d0461a6 (#10614) Detect when trying to managing ACLs on a non-ACL volume
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
374fee5cd4a5 (#10614) Provide default metadata values for Windows ACLs
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
f60e8893a906 (#10614) Add method for detecting Windows volumes that support ACLs
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
1371dbd81dc2 (#10614) Fix setting and clearing read-only attribute on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
7eb0197f33bc (#10614) Fix error checking for Windows BOOL return values
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
e29b5df49e2d Merge pull request #198 from ody/feature/2.6.x/5617
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
9dfd011e43cd (#5617) Puppet queue logging
Author
Cody Herriges <cody@puppetlabs.com>
Browse Repository
No Builds
No Audits
85dceff5691c Merge remote-tracking branch 'nicklewis/ticket/2.6.x/10289' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
a91cfa14dde5 maint: Fix failing spec on old version of rspec
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ed8ae1fb5ae Merge remote-tracking branch 'nicklewis/ticket/2.6.x/10289' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
aa2a762021ed (#10289) Add an ext script to upload facts to inventory server
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
5129d3858432 (#10289) Add a safe alternative to REST for inventory service
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (30)

Path

Size

acceptance/

tests/

ticket_6907_use_provider_in_same_run_it_becomes_suitable.rb

ext/

upload_facts.rb

install.rb

lib/

puppet/

application/

indirector/

facts/

inventory_service.rb

parser/

grammar.ra

parser.rb

provider/

service/

sshkey/

reference/

ssl/

type/

file/

mode.rb

util/

settings/

file_setting.rb

spec/

integration/

provider/

service/

init_spec.rb

reference/

providers_spec.rb

unit/

application/

apply_spec.rb

indirector/

facts/

inventory_service_spec.rb

parser/

parser_spec.rb

provider/

exec/

windows_spec.rb

ssl/

host_spec.rb

transaction_spec.rb

type/

file/

mode_spec.rb

type_spec.rb

util/

settings/

file_setting_spec.rb

test/

other/

transactions.rb

rPUaf6636a71b79

View Options

acceptance/tests/ticket_6907_use_provider_in_same_run_it_becomes_suitable.rb

View Options

ext/upload_facts.rb

View Options

install.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/application/apply.rb

View Options

lib/puppet/application/queue.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/indirector/facts/inventory_service.rb

View Options

lib/puppet/parser/grammar.ra

View Options

lib/puppet/parser/parser.rb

View Options

lib/puppet/provider/service/init.rb

View Options

lib/puppet/provider/sshkey/parsed.rb

View Options

lib/puppet/reference/providers.rb

View Options

lib/puppet/ssl/host.rb

View Options

lib/puppet/transaction.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/file/mode.rb

View Options

lib/puppet/util/settings/file_setting.rb

View Options

spec/integration/provider/service/init_spec.rb

View Options

spec/integration/reference/providers_spec.rb

View Options

spec/unit/application/apply_spec.rb

View Options

spec/unit/indirector/facts/inventory_service_spec.rb

View Options

spec/unit/parser/parser_spec.rb

View Options

spec/unit/provider/exec/windows_spec.rb

View Options

spec/unit/ssl/host_spec.rb

View Options

spec/unit/transaction_spec.rb

View Options

spec/unit/type/file/mode_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/settings/file_setting_spec.rb

View Options

test/other/transactions.rb

Merge branch '2.7.x' into 2.7rcaf6636a71b79UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (30)

rPUaf6636a71b79

acceptance/tests/ticket_6907_use_provider_in_same_run_it_becomes_suitable.rb

ext/upload_facts.rb

install.rb

lib/puppet/application/agent.rb

lib/puppet/application/apply.rb

lib/puppet/application/queue.rb

lib/puppet/defaults.rb

lib/puppet/indirector/facts/inventory_service.rb

lib/puppet/parser/grammar.ra

lib/puppet/parser/parser.rb

lib/puppet/provider/service/init.rb

lib/puppet/provider/sshkey/parsed.rb

lib/puppet/reference/providers.rb

lib/puppet/ssl/host.rb

lib/puppet/transaction.rb

lib/puppet/type.rb

lib/puppet/type/file/mode.rb

lib/puppet/util/settings/file_setting.rb

spec/integration/provider/service/init_spec.rb

spec/integration/reference/providers_spec.rb

spec/unit/application/apply_spec.rb

spec/unit/indirector/facts/inventory_service_spec.rb

spec/unit/parser/parser_spec.rb

spec/unit/provider/exec/windows_spec.rb

spec/unit/ssl/host_spec.rb

spec/unit/transaction_spec.rb

spec/unit/type/file/mode_spec.rb

spec/unit/type_spec.rb

spec/unit/util/settings/file_setting_spec.rb

test/other/transactions.rb

Merge branch '2.7.x' into 2.7rc
af6636a71b79Unpublished
Actions