summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-24Merge commit '38cf1269a499acd9b85390afd6200c2f143fbffc' as ↵subtreeMicah
'puppet/modules/systemd'
2016-05-24Squashed 'puppet/modules/systemd/' content from commit 6d47fd4Micah
git-subtree-dir: puppet/modules/systemd git-subtree-split: 6d47fd4999fe03eba6fb11c4490dcbb90d937900
2016-05-24Merge commit 'c9d50f333a81c716f3e227e9eb449dc76b6eb6e3' as ↵Micah
'puppet/modules/check_mk'
2016-05-24Squashed 'puppet/modules/check_mk/' content from commit aa02571Micah
git-subtree-dir: puppet/modules/check_mk git-subtree-split: aa02571537af90ac73309e6e216c9417802548c3
2016-05-24Merge commit 'bb047f1665d63b84d4f18005c938dafc502bc1fd' as ↵Micah
'puppet/modules/sysctl'
2016-05-24Merge commit 'e1ddddf2a0f81cdab84deeecec3e068d333b6ce8' as ↵Micah
'puppet/modules/backupninja'
2016-05-24Squashed 'puppet/modules/sysctl/' content from commit 975852bMicah
git-subtree-dir: puppet/modules/sysctl git-subtree-split: 975852b7acc1125b4cd9d4d490b9abd8d31217e6
2016-05-24Squashed 'puppet/modules/backupninja/' content from commit 5268a87Micah
git-subtree-dir: puppet/modules/backupninja git-subtree-split: 5268a87c329f895017f8ea6c6abc377a4f9a6a77
2016-05-24Merge commit '1419079315b69a271b5019bcf5e7c4df39633677' as ↵Micah
'puppet/modules/rsyslog'
2016-05-24Squashed 'puppet/modules/rsyslog/' content from commit b8ef11cMicah
git-subtree-dir: puppet/modules/rsyslog git-subtree-split: b8ef11c23949d12732ad5cdaebb3023ff39a297a
2016-05-24Merge commit '92a1ac5b29b497ee659c8097a5c0de94a481181c' as ↵Micah
'puppet/modules/vcsrepo'
2016-05-24Squashed 'puppet/modules/vcsrepo/' content from commit 4e23209Micah
git-subtree-dir: puppet/modules/vcsrepo git-subtree-split: 4e23209eaccf1ab504d35158f4141b3053327c2f
2016-05-24Merge commit '6570cad05280d8fc9c9c22a403e1dc234ca6ab25' as ↵Micah
'puppet/modules/postfix'
2016-05-24Merge commit 'a05b4b033f8ef74b38df962f23465110fa9a95d1' as ↵Micah
'puppet/modules/squid_deb_proxy'
2016-05-24Squashed 'puppet/modules/postfix/' content from commit cce918fMicah
git-subtree-dir: puppet/modules/postfix git-subtree-split: cce918f784ebf8a8875f43c79bc3a1f39ab9456b
2016-05-24Squashed 'puppet/modules/squid_deb_proxy/' content from commit 08bfaccMicah
git-subtree-dir: puppet/modules/squid_deb_proxy git-subtree-split: 08bfaccaea01fd2d334946428504e71a51748e3d
2016-05-24Merge commit '00c8ba34ffe8f2e0d7dfd6fb6c3eddd6600557a0' as ↵Micah
'puppet/modules/haproxy'
2016-05-24Squashed 'puppet/modules/haproxy/' content from commit af322a7Micah
git-subtree-dir: puppet/modules/haproxy git-subtree-split: af322a73c013f80a958ab7d5d31d0c75cf6d0523
2016-05-24Merge commit '027eb22ae7ce1fc06f32b7c8920abaf7ff7251a9' as ↵Micah
'puppet/modules/stunnel'
2016-05-24Merge commit '27f6b09be549aeebae459259ef37aaa665b7ee7d' as 'puppet/modules/tor'Micah
2016-05-24Squashed 'puppet/modules/stunnel/' content from commit 79e874cMicah
git-subtree-dir: puppet/modules/stunnel git-subtree-split: 79e874c1a86ad5c48c4e726a5d4c68bd879ce454
2016-05-24Squashed 'puppet/modules/tor/' content from commit 9981a70Micah
git-subtree-dir: puppet/modules/tor git-subtree-split: 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1
2016-05-24Merge commit 'a8c803387fe3a53cfee912470d98b1a39d8b1940' as ↵Micah
'puppet/modules/nagios'
2016-05-24Squashed 'puppet/modules/nagios/' content from commit e6fee3cMicah
git-subtree-dir: puppet/modules/nagios git-subtree-split: e6fee3c731f68ccf8b6add8ada2162c7ad2b8407
2016-05-24Merge commit 'c9be0212c9e45f609d299f5fbdf8f13a63747be6' as ↵Micah
'puppet/modules/unbound'
2016-05-24Merge commit '1da5dc55ee48fcd437f5b5df00a5b2f3991ec9f1' as ↵Micah
'puppet/modules/stdlib'
2016-05-24Squashed 'puppet/modules/unbound/' content from commit a26b91dMicah
git-subtree-dir: puppet/modules/unbound git-subtree-split: a26b91dfea3189e6777629fa00d54f51dc41f4d4
2016-05-24Squashed 'puppet/modules/stdlib/' content from commit 7112363Micah
git-subtree-dir: puppet/modules/stdlib git-subtree-split: 71123634744b9fe2ec7d6a3e38e9789fd84801e3
2016-05-24Merge commit '99500c162d8bd5ed017112e7568272ad08adff6c' as ↵Micah
'puppet/modules/augeas'
2016-05-24Squashed 'puppet/modules/augeas/' content from commit 27e3359Micah
git-subtree-dir: puppet/modules/augeas git-subtree-split: 27e33591776f0226f78877df350d6a52995265d8
2016-05-24Merge commit '313e3080b1dc2bdfa048b8f3301b42e5d83b0d03' as ↵Micah
'puppet/modules/passenger'
2016-05-24Squashed 'puppet/modules/passenger/' content from commit 47fca11Micah
git-subtree-dir: puppet/modules/passenger git-subtree-split: 47fca117b594d30aa29d33f8d8846eeec0a88d5f
2016-05-24Merge commit '09c79400ae368fa7f9b4e910451eef496c702d6c' as 'puppet/modules/x509'Micah
2016-05-24Merge commit 'c6e19c357119c5be9a2e439c4fc8e58d9e54c687' as 'puppet/modules/ruby'Micah
2016-05-24Squashed 'puppet/modules/x509/' content from commit 19254a3Micah
git-subtree-dir: puppet/modules/x509 git-subtree-split: 19254a38c1c372ae7912ea9f15500b9b1cbffe81
2016-05-24Squashed 'puppet/modules/ruby/' content from commit 9ccd853Micah
git-subtree-dir: puppet/modules/ruby git-subtree-split: 9ccd853c49af7d0b57ebd9c2ea7673b193fce24b
2016-05-24Merge commit '56761711a92ece9414ed5a7ba67ef1ede724e4db' as ↵Micah
'puppet/modules/rubygems'
2016-05-24Squashed 'puppet/modules/rubygems/' content from commit 510a369Micah
git-subtree-dir: puppet/modules/rubygems git-subtree-split: 510a3693eab5dc78ed27d3728ee4d3b12334ea12
2016-05-24Merge commit '20a58814984e4d3f1235a5b3ae94959df0e85887' as ↵Micah
'puppet/modules/bundler'
2016-05-24Merge commit '807877b736c5f56689229b31024861f19a9b0ac6' as ↵Micah
'puppet/modules/apache'
2016-05-24Squashed 'puppet/modules/bundler/' content from commit bacec3eMicah
git-subtree-dir: puppet/modules/bundler git-subtree-split: bacec3e072649be4ade56f7df8506b46ae9c5166
2016-05-24Squashed 'puppet/modules/apache/' content from commit 415e950Micah
git-subtree-dir: puppet/modules/apache git-subtree-split: 415e9504f99dca3ccaa4dfd389dde24ad9d0e01c
2016-05-24Merge commit 'af6fdd31fb961fc1b7f408f51001e7a6d192a58a' as ↵Micah
'puppet/modules/couchdb'
2016-05-24Squashed 'puppet/modules/couchdb/' content from commit 76ff149Micah
git-subtree-dir: puppet/modules/couchdb git-subtree-split: 76ff149a095023611c05bbb00157d06f87b07c05
2016-05-24Merge commit '4d36a4d9ca9880d9cc12f81b84a50981831d9394' as ↵Micah
'puppet/modules/resolvconf'
2016-05-24Merge commit 'b0e1e4c82db3c70ddc67639a9b983de89b415477' as ↵Micah
'puppet/modules/shorewall'
2016-05-24Squashed 'puppet/modules/resolvconf/' content from commit c7eca07Micah
git-subtree-dir: puppet/modules/resolvconf git-subtree-split: c7eca077fdda063edc96d3bea02c4774569e4b10
2016-05-24Squashed 'puppet/modules/shorewall/' content from commit 34fbca6Micah
git-subtree-dir: puppet/modules/shorewall git-subtree-split: 34fbca68d478c2edd5f13e74245cf675b5b53303
2016-05-24Merge commit 'c54fc2c945c06511449b2daefee13cbd9b0232d8' as ↵Micah
'puppet/modules/common'
2016-05-24Squashed 'puppet/modules/common/' content from commit ae14962Micah
git-subtree-dir: puppet/modules/common git-subtree-split: ae149624f9bc551865b93b9b7155af2de8deeb71