Merge remote-tracking branch 'shared/master' into leap_master
authorvarac <varacanero@zeromail.org>
Wed, 2 Dec 2015 10:53:45 +0000 (11:53 +0100)
committervarac <varacanero@zeromail.org>
Wed, 2 Dec 2015 10:53:45 +0000 (11:53 +0100)
commit3bb4d2667be274ba51eb3d8442e55c98789a4d76
tree733fd1ab282a848a749386a604b8f5662f6529ed
parentb0dc7c84b5f55aec12d7d65da812037913d9dbee
parent6080f71be080860a20cf31cf491296ccbef7adb1
Merge remote-tracking branch 'shared/master' into leap_master
manifests/service.pp