diff options
author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-03-18 14:18:50 +0100 |
---|---|---|
committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2013-03-18 14:18:50 +0100 |
commit | 0522cd5fc6f139685f76c701142d5c296b85650a (patch) | |
tree | 2921676d607896f13457fc65ae29ab9cd44abf58 /spec/hosts/simple_debian_squeeze_spec.rb | |
parent | ded6f67c399d31d6b3d6d5d7295bfad0cf786102 (diff) | |
parent | e6387fd42aff6c72a8f887461be978e6151410f7 (diff) |
Merge branch 'master' of github.com:camptocamp/puppet-augeas into sub/augeas/validate_re
Conflicts:
manifests/lens.pp
Diffstat (limited to 'spec/hosts/simple_debian_squeeze_spec.rb')
0 files changed, 0 insertions, 0 deletions