aboutsummaryrefslogtreecommitdiff
path: root/puppet
AgeCommit message (Collapse)Author
2015-11-06Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into developSilvio Rhatto
Conflicts: puppet/puppet.conf
2014-10-24Merge commit 'f9fa240c5227020dd10c6f1f309afba1d5a75c1e'Silvio Rhatto
2014-10-24Adding debian.ppSilvio Rhatto
2014-10-01Merge commit 'ed6bb4f9fa972096ca599198c0ed662a8ab01b1e'Silvio Rhatto
2014-10-01Merge commit 'c1af9eeeaef30150c33ff5c262998bf4b3744e14'Silvio Rhatto
2014-10-01Merge commit '587f206824274d7d1cfcb1072ea8f818493bd317'Silvio Rhatto
2014-09-18Puppet configurationSilvio Rhatto
2014-09-18Squashed 'puppet/' content from commit bb2eae6Silvio Rhatto
git-subtree-dir: puppet git-subtree-split: bb2eae6f3a1f44fef0a05000d79c298442fa24c7
2014-09-18Merge commit '529cd5077e3d76c1d5b612bc146ab174d7143c30' as 'puppet'Silvio Rhatto