Diffusion puppet 597d134b6555

Merge remote-tracking branch 'origin/2.7.x'
597d134b6555Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'origin/2.7.x'

Conflicts:
spec/unit/parser/functions/create_resources_spec.rb
spec/unit/resource_spec.rb

Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>

Details

Provenance

Daniel Pittman <daniel@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUb01088d11201: Merge remote-tracking branch 'origin/2.7rc' into 2.7.x
rPUfc0e8c480035: Merge pull request #545 from pcarlisle/ticket/master/12891-reload-features

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU597d134b6555: Merge remote-tracking branch 'origin/2.7.x' (authored by Daniel Pittman <daniel@puppetlabs.com>).Mar 9 2012, 10:21 PM

Merged Changes

b01088d11201 Merge remote-tracking branch 'origin/2.7rc' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
63f8fe9e2f9f Merge remote-tracking branch 'origin/2.6.x' into 2.7.x
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
031cbad48bc7 Merge pull request #568 from daniel-pittman/maint/2.7.x/12960-fix-order…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
40ee256f15d6 Finally, stop using the `foo` name in the type_spec test.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
245f1b9961e3 Clean up the "foo" name in create_resources_spec.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
eb2c71bb9acf Clean up "foo" name in global resource state.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec5c4bfc9a22 Document the problem with the `apply_to_device` and related methods.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
dad6f1728177 Merge pull request #565 from lotheac/fix_subcommand_exit_status
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
290c39fbfbb9 Merge pull request #562 from stschulte/ticket/2.7.x/12960
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
d3083d09db97 Merge pull request #566 from daniel-pittman/maint/2.7.x/fix-pkg-provider-tests…
Author
pcarlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
d6da1b7b66b9 Fix hash comparison under RSpec with 1.8.5
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
b27f64aa0dc3 Merge pull request #560 from stschulte/ticket/2.7.x/7986
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
0b7841a052dd (#12960) Fix puppet resource <type> if type has no providers
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
70d73fa41906 Merge pull request #536 from pcarlisle/ticket/2.7.x/9491-filesetting-munging
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
6a312873eae3 (#12981) Fix external subcommand exit status
Author
Lauri Tirkkonen <lotheac@iki.fi>
Browse Repository
No Builds
No Audits
54e5d18efe98 (#7986) Modify pkg provider to handle publisher
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
2e3292444903 (#7986) Cleanup pkg provider #2
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
113fc5410df5 (#7986) Cleanup pkg provider #1
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
ea116f587b6c Updating puppet.spec for 2.7.11-1, 2.7.11-2
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
c4b3c8470698 (#9491) Preserve trailing slashes in FileSettings
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
b00f8600a3cf Merge tag '2.6.14' into 2.6.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
a61c7851ee3f Updating CHANGELOG and lib/puppet.rb for 2.6.14
Author
Matthaus Litteken <matthaus@puppetlabs.com>
Browse Repository
No Builds
No Audits
4173839dd274 Merge pull request #509 from justinstoller/bug/2.6.x/12692…
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
60b7aa540ca4 Prior to this commit we hard coded paths in two tests that depended on our CI…
Author
Justin Stoller <justin@puppetlabs.com>
Browse Repository
No Builds
No Audits
ade5965e4e4d Remove unnecessary fallbacks in change_{user,group}
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0a09a64457ef Document uid/gid-related methods in Puppet::Util
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
2599d563ff29 Copy owner/group in replace_file
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
ead36ff3a8b4 (#12463) eliminate `secure_open` in favour of `replace_file`
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
146953861e00 (#12460) use `replace_file` for the .k5login file
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
8461203aa7eb (#12462) user_role_add: use `replace_file` for /etc/shadow
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
0ad532a4b26e (#12463) add secure `replace_file` to Puppet::Util
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
76d0749f0a9a (#12459) drop supplementary groups when permanently dropping UID
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
50909b93dc01 (#12458) default to users primary group, not root, in `asuser`
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
d00c5cc45e3c (#12457) add users primary group, not Process.gid, in initgroups
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

CHANGELOG

acceptance/

tests/

resource/

service/

ticket_4123_should_list_all_running_redhat.rb

ticket_4124_should_list_all_disabled.rb

conf/

redhat/

puppet.spec

lib/

puppet/

provider/

package/

util/

settings/

spec/

fixtures/

unit/

provider/

package/

pkg/

unit/

parser/

functions/

create_resources_spec.rb

provider/

package/

util/

settings/

rPU597d134b6555

View Options

CHANGELOG

View Options

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

View Options

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

View Options

conf/redhat/puppet.spec

View Options

lib/puppet/provider/package/pkg.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/util/command_line.rb

View Options

lib/puppet/util/settings/file_setting.rb

View Options

spec/fixtures/unit/provider/package/pkg/dummy

View Options

spec/fixtures/unit/provider/package/pkg/incomplete

View Options

spec/fixtures/unit/provider/package/pkg/publisher

View Options

spec/fixtures/unit/provider/package/pkg/simple

View Options

spec/unit/parser/functions/create_resources_spec.rb

View Options

spec/unit/provider/package/pkg_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/command_line_spec.rb

View Options

spec/unit/util/settings/file_setting_spec.rb

Merge remote-tracking branch 'origin/2.7.x'597d134b6555UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (19)

rPU597d134b6555

CHANGELOG

acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb

acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb

conf/redhat/puppet.spec

lib/puppet/provider/package/pkg.rb

lib/puppet/type.rb

lib/puppet/util/command_line.rb

lib/puppet/util/settings/file_setting.rb

spec/fixtures/unit/provider/package/pkg/dummy

spec/fixtures/unit/provider/package/pkg/incomplete

spec/fixtures/unit/provider/package/pkg/publisher

spec/fixtures/unit/provider/package/pkg/simple

spec/unit/parser/functions/create_resources_spec.rb

spec/unit/provider/package/pkg_spec.rb

spec/unit/resource_spec.rb

spec/unit/type_spec.rb

spec/unit/util/command_line_spec.rb

spec/unit/util/settings/file_setting_spec.rb

Merge remote-tracking branch 'origin/2.7.x'
597d134b6555Unpublished
Actions