aboutsummaryrefslogtreecommitdiff
path: root/puppet/files/patches/trusty
AgeCommit message (Collapse)Author
2015-11-06Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into developSilvio Rhatto
Conflicts: puppet/puppet.conf
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 05:51:58 +0000