]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
(#8797) Merge puppetlabs-functions into puppetlabs-stdlib
authorKen Barber <ken@bob.sh>
Fri, 5 Aug 2011 07:52:00 +0000 (08:52 +0100)
committerKen Barber <ken@bob.sh>
Fri, 5 Aug 2011 09:31:46 +0000 (10:31 +0100)
commitaa27fc76c7d5fa090ea1d47027856c3e70c6ae8f
treedc9a4ae93fc7345d719de29d956f6488c1b69005
parent07d0eca31780bba76f2283ce83f944473ce8fe00
parent1b73a66fc67af0e33fa41aacf50654d4a7a4903c
(#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.
.gitignore
LICENSE
spec/spec_helper.rb