diff options
author | Mike Dodge <mikedodge04@fb.com> | 2015-03-10 23:29:49 -0700 |
---|---|---|
committer | Mike Dodge <mikedodge04@fb.com> | 2015-03-10 23:29:49 -0700 |
commit | c9b78f9dc2cd13cf3e8cbb5115fa39d80548e80f (patch) | |
tree | 79f0d31635f3e19e13eee031b00c5af0c882777f /.kitchen.yml | |
parent | 07da5a4c2498ca68d485ef927dd23e5308d6e62b (diff) | |
parent | be5d288671bf5460f227c1b5297f300d36388c20 (diff) | |
download | chef-c9b78f9dc2cd13cf3e8cbb5115fa39d80548e80f.tar.gz |
Merge branch 'macosx_service_update' of https://github.com/mikedodge04/chef into macosx_service_update
Conflicts:
lib/chef/provider/service/macosx.rb
Diffstat (limited to '.kitchen.yml')
0 files changed, 0 insertions, 0 deletions