Diffusion puppet 25213bfcd0c3

Merge branch '2.7.x'
25213bfcd0c3Unpublished
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: (27 commits) Updated CHANGELOG for 2.7.6rc2 (#9832) General StoreConfigs regression. (#9832) General StoreConfigs regression. (#9607) Only validate package source when it is set or needed (#9461) Resolve executables using PATHEXT on Windows (#9938) Allow directory sticky-ness to be set Stub method for getting roles from the user provider Set vardir so that msi package provider runs on Windows Add Windows-specific tests when user parameter specified in exec Disable mount provider tests on Windows Update test due to lack of 'true' on Windows Change tests to not use 'mount' provider Added 'touch' method enabling tests to run on Windows Change test to not call 'rm -rf' Updated CHANGELOG for 2.7.6rc1 Remove 'fails_on_windows' tag for passing tests (#9027) Get rid of spurious info messages in groupadd (#8414) Create scheduled_task type for use with Windows scheduled tasks (#8414) Require win32-taskscheduler gem on Windows Add ability to look up fully qualified local accounts using Puppet::Util::Adsi.sid_for_account ...

Manually Resolved Conflicts:
spec/unit/resource/catalog_spec.rb

Details

Provenance

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

Parents

rPU5e3962c5b149: Merge remote-tracking branch 'stschulte/ticket/2.7.x/9796' into 2.7.x
rPU941e7945925f: Merge branch '2.7.x'

Branches

Unknown

Tags

Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPU25213bfcd0c3: Merge branch '2.7.x' (authored by Matt Robinson <matt@puppetlabs.com>).Oct 12 2011, 11:19 PM

Merged Changes

5e3962c5b149 Merge remote-tracking branch 'stschulte/ticket/2.7.x/9796' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
5a52ae126623 Merge remote-tracking branch 'josh/sticky-bit' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
11d7857e1f86 Merge branch '2.7rc' into 2.7.x
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
bedf7d2f4f56 Updated CHANGELOG for 2.7.6rc2
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
d457763d6b80 (#9832) General StoreConfigs regression.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
1b049dcbe4fe Merge pull request #160 from daniel-pittman/bug/2.7.x/9832-storeconfigs…
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
e9f653c40957 Merge remote-tracking branch 'jhelwig/tickets/2.7.x/8414-windows-task-scheduler…
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
baf09b106c4f Merge remote-tracking branch 'josh/puppet-resource-package' into 2.7.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
cf8fae216269 (#9832) General StoreConfigs regression.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
1e8a2cd86baf (#9607) Only validate package source when it is set or needed
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
0258096c474d (#9461) Resolve executables using PATHEXT on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
d78afda39173 (#9938) Allow directory sticky-ness to be set
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
48c6077682be Merge remote-tracking branch 'josh/maint/2.7.x/reenable-fails-on-windows' into…
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
b3c0f1dab3cf Stub method for getting roles from the user provider
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
006a12830f5d Set vardir so that msi package provider runs on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
4185b4eb74e5 Add Windows-specific tests when user parameter specified in exec
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
aab6b40a56f1 Disable mount provider tests on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
58f97e36830e Update test due to lack of 'true' on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
1fd90c356a9b Change tests to not use 'mount' provider
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
220f5e052e4e Added 'touch' method enabling tests to run on Windows
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
ca0bc4f9a175 Change test to not call 'rm -rf'
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
78f13c57b465 Merge branch 'maint/2.7.x/provider_parameter_description' of https://github.
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
8e302f6f1f92 Merge branch 'ticket/2.7.x/9459-user-group-failures' into 2.7.x
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
245dfb7b335a Updated CHANGELOG for 2.7.6rc1
Author
Michael Stahnke <stahnma@puppetlabs.com>
Browse Repository
No Builds
No Audits
1883455a16e6 Remove 'fails_on_windows' tag for passing tests
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
81ff060f514f Merge pull request #151 from joshcooper/ticket/2.7.x/9027-groupadd-aix-warning
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
9c25af46a9b5 (#9027) Get rid of spurious info messages in groupadd
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
0d7c79727cfb (#8414) Create scheduled_task type for use with Windows scheduled tasks
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
4ddef893700a (#8414) Require win32-taskscheduler gem on Windows
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
0ecf3ab382a1 Add ability to look up fully qualified local accounts using Puppet::Util::Adsi.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
23d5aeb5cbc1 Add support for displaying hashes to Puppet::Parameter.format_value_for_display
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
f0c3414b370a Move parameter formatting rules into helper method
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
845e05b60a31 Wrap long lines in Type::Package
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
18d65ec6033a Whitespace cleanup in Type::SshAuthorizedKey
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
9d504ff11d64 (#9796) ssh_authorized_key supports whitespace again
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
122b8c287947 (#9459) Fix problems with Windows 'user' and 'group' providers.
Author
Cameron Thomas <cameron@puppetlabs.com>
Browse Repository
No Builds
No Audits
27057a691f9c Maint: Fix the "provider" parameter documentation
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

conf/

redhat/

lib/

puppet/

feature/

indirector/

resource/

active_record.rb

provider/

group/

windows_adsi.rb

package/

win32_taskscheduler.rb

user/

windows_adsi.rb

type/

scheduled_task.rb

ssh_authorized_key.rb

util/

windows/

spec/

integration/

file_serving/

terminus_helper_spec.rb

indirector/

direct_file_server_spec.rb

file_content/

file_server_spec.rb

file_metadata/

file_server_spec.rb

provider/

package_spec.rb

ssl/

certificate_request_spec.rb

certificate_revocation_list_spec.rb

transaction_spec.rb

util/

windows/

security_spec.rb

unit/

configurer/

downloader_spec.rb

file_bucket/

indirector/

resource/

active_record_spec.rb

resource_type/

parameter_spec.rb

property_spec.rb

provider/

group/

windows_adsi_spec.rb

mount/

package/

win32_taskscheduler_spec.rb

ssh_authorized_key/

user/

user_role_add_spec.rb

useradd_spec.rb

windows_adsi_spec.rb

resource/

catalog_spec.rb

ssl/

transaction/

type/

file/

content_spec.rb

resources_spec.rb

scheduled_task_spec.rb

ssh_authorized_key_spec.rb

util/

execution_stub_spec.rb

logging_spec.rb

rPU25213bfcd0c3

CHANGELOG

Loading...

conf/redhat/puppet.spec

Loading...

lib/puppet.rb

Loading...

lib/puppet/feature/base.rb

Loading...

lib/puppet/indirector/resource/active_record.rb

Loading...

lib/puppet/parameter.rb

Loading...

lib/puppet/property.rb

Loading...

lib/puppet/provider/group/windows_adsi.rb

Loading...

lib/puppet/provider/package/msi.rb

Loading...

lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

Loading...

lib/puppet/provider/user/windows_adsi.rb

Loading...

lib/puppet/resource.rb

Loading...

lib/puppet/type.rb

Loading...

lib/puppet/type/group.rb

Loading...

lib/puppet/type/package.rb

Loading...

lib/puppet/type/scheduled_task.rb

Loading...

lib/puppet/type/ssh_authorized_key.rb

Loading...

lib/puppet/util.rb

Loading...

lib/puppet/util/adsi.rb

Loading...

lib/puppet/util/windows/security.rb

Loading...

spec/integration/file_serving/terminus_helper_spec.rb

Loading...

spec/integration/indirector/direct_file_server_spec.rb

Loading...

spec/integration/indirector/file_content/file_server_spec.rb

Loading...

spec/integration/indirector/file_metadata/file_server_spec.rb

Loading...

spec/integration/provider/package_spec.rb

Loading...

spec/integration/ssl/certificate_request_spec.rb

Loading...

spec/integration/ssl/certificate_revocation_list_spec.rb

Loading...

spec/integration/ssl/host_spec.rb

Loading...

spec/integration/transaction_spec.rb

Loading...

spec/integration/util/windows/security_spec.rb

Loading...

spec/unit/configurer/downloader_spec.rb

Loading...

spec/unit/file_bucket/dipper_spec.rb

Loading...

spec/unit/indirector/resource/active_record_spec.rb

Loading...

spec/unit/indirector/resource/ral_spec.rb

Loading...

spec/unit/indirector/resource_type/parser_spec.rb

Loading...

spec/unit/parameter_spec.rb

Loading...

spec/unit/property_spec.rb

Loading...

spec/unit/provider/group/windows_adsi_spec.rb

Loading...

spec/unit/provider/mount/parsed_spec.rb

Loading...

spec/unit/provider/package/msi_spec.rb

Loading...

spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb

Loading...

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

Loading...

spec/unit/provider/user/user_role_add_spec.rb

Loading...

spec/unit/provider/user/useradd_spec.rb

Loading...

spec/unit/provider/user/windows_adsi_spec.rb

Loading...

spec/unit/resource/catalog_spec.rb

Loading...

spec/unit/ssl/host_spec.rb

Loading...

spec/unit/transaction/report_spec.rb

Loading...

spec/unit/type/exec_spec.rb

Loading...

spec/unit/type/file/content_spec.rb

Loading...

spec/unit/type/file/source_spec.rb

Loading...

spec/unit/type/group_spec.rb

Loading...

spec/unit/type/mount_spec.rb

Loading...

spec/unit/type/resources_spec.rb

Loading...

spec/unit/type/scheduled_task_spec.rb

Loading...

spec/unit/type/ssh_authorized_key_spec.rb

Loading...

spec/unit/type/user_spec.rb

Loading...

spec/unit/type_spec.rb

Loading...

spec/unit/util/adsi_spec.rb

Loading...

spec/unit/util/execution_stub_spec.rb

Loading...

spec/unit/util/logging_spec.rb

Loading...

spec/unit/util_spec.rb

Loading...