HomePhorge

Merge branch 'file-providers' of https://github.com/joshcooper/puppet into 2.7.x
ec587b449e56Unpublished

Unpublished Commit Ā· Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'file-providers' of https://github.com/joshcooper/puppet into 2.7.x

Conflicts:
lib/puppet/util/adsi.rb
spec/unit/util/adsi_spec.rb

Event Timeline

Cameron Thomas <cameron@puppetlabs.com> committed rPUec587b449e56: Merge branch 'file-providers' of https://github.com/joshcooper/puppet into 2.7.x (authored by Cameron Thomas <cameron@puppetlabs.com>).Sep 30 2011, 11:06 PM

Merged Changes