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
Merge branch 'file-providers' of https://github.com/joshcooper/puppet into 2.7.x ec587b449e56Unpublished
Tags None Referenced Files None Subscribers None
Description Merge branch 'file-providers' of https://github.com/joshcooper/puppet into 2.7.x Conflicts:
Details
Event TimelineCameron 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 PM2011-09-30 23:06:40 (UTC+2)
Merged Changes |