diff options
| author | Ken Barber <ken@bob.sh> | 2011-08-05 08:52:00 +0100 |
|---|---|---|
| committer | Ken Barber <ken@bob.sh> | 2011-08-05 10:31:46 +0100 |
| commit | aa27fc76c7d5fa090ea1d47027856c3e70c6ae8f (patch) | |
| tree | dc9a4ae93fc7345d719de29d956f6488c1b69005 /spec/fixtures/master_config/ssl/public_keys/puppetmaster.pem | |
| parent | 07d0eca31780bba76f2283ce83f944473ce8fe00 (diff) | |
| parent | 1b73a66fc67af0e33fa41aacf50654d4a7a4903c (diff) | |
| download | puppet-stdlib-aa27fc76c7d5fa090ea1d47027856c3e70c6ae8f.tar.gz puppet-stdlib-aa27fc76c7d5fa090ea1d47027856c3e70c6ae8f.tar.bz2 | |
(#8797) Merge puppetlabs-functions into puppetlabs-stdlib
It was decided that maintaining puppetlabs-functions and
puppetlabs-stdlib was duplication as both are trying to
achieve the same goal.
This patch provides a merge of the puppetlabs-functions
into the puppetlabs-stdlib repository, with history
preservation.
The following conflicts were found and resolved:
* LICENSE file from functions was used as it aligns with
ASL usage instructions and contains relevant copyright
information:
http://www.apache.org/licenses/LICENSE-2.0.html
* Used spec_helper.rb from functions - this is what
Puppet core uses and doesn't break tests.
* Merged .gitignore and spec.opts options.
Diffstat (limited to 'spec/fixtures/master_config/ssl/public_keys/puppetmaster.pem')
0 files changed, 0 insertions, 0 deletions