diff options
author | sersut <serdar@opscode.com> | 2014-03-30 13:45:00 -0700 |
---|---|---|
committer | sersut <serdar@opscode.com> | 2014-03-30 13:45:00 -0700 |
commit | 7a1778fb309423114462d578e01ba0e00108010f (patch) | |
tree | 792e1fbafdca12725edf923cdad22536f3124fc3 /spec/unit/resource/ohai_spec.rb | |
parent | 0d097217dda26ac5551d1ad24132d9e53a62e0fb (diff) | |
parent | cacf2a53a3b789829dd6b5b2956e07cc1aa42931 (diff) | |
download | chef-8f7830f3a37bfbc37f918c6ae67c664336b737aa.tar.gz |
Merge branch 'master' into 11-stable11.12.0.rc.0
Merging mater branch for RC version.
Diffstat (limited to 'spec/unit/resource/ohai_spec.rb')
0 files changed, 0 insertions, 0 deletions