]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6237446 80f0962)
Merge remote-tracking branch 'upstream/4.5.x' into merge_4.5.x_into_master
authorMorgan Haskel <morgan@puppetlabs.com>
Wed, 17 Dec 2014 01:32:40 +0000 (17:32 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Wed, 17 Dec 2014 01:32:40 +0000 (17:32 -0800)
Conflicts:
metadata.json


Trivial merge
Puppet module for stdlib