HomePhorge
Diffusion puppet b90b559d5d2a

Merge branch 'ticket/2.7.x/9328-user-group-sids' into 2.7.x
b90b559d5d2aUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'ticket/2.7.x/9328-user-group-sids' into 2.7.x

  • ticket/2.7.x/9328-user-group-sids: (#9328) Retrieve user and group SIDs on windows.

Conflicts:
lib/puppet/provider/user/windows_adsi.rb

Resolved conflict with getting/setting user passwords

Details

Provenance
Josh Cooper <josh@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU6533292f766e: (#9328) Retrieve user and group SIDs on windows.
rPU4ecbe94924cb: Merge pull request #136 from mmrobins/ticket/2.7.
Branches
Unknown
Tags
Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUb90b559d5d2a: Merge branch 'ticket/2.7.x/9328-user-group-sids' into 2.7.x (authored by Josh Cooper <josh@puppetlabs.com>).Sep 29 2011, 10:40 PM

Merged Changes

Changes (8)

PathSize
lib/
puppet/
provider/
group/
user/
type/
util/
spec/
unit/
provider/
group/
user/
util/

rPUb90b559d5d2a

View Options

lib/puppet/provider/group/windows_adsi.rb

Loading...
View Options

lib/puppet/provider/user/windows_adsi.rb

Loading...
View Options

lib/puppet/type/group.rb

Loading...
View Options

lib/puppet/type/user.rb

Loading...
View Options

lib/puppet/util/adsi.rb

Loading...
View Options

spec/unit/provider/group/windows_adsi_spec.rb

Loading...
View Options

spec/unit/provider/user/windows_adsi_spec.rb

Loading...
View Options

spec/unit/util/adsi_spec.rb

Loading...