summaryrefslogtreecommitdiff
path: root/lib/chef/mixin/deep_merge.rb
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-07-02 07:58:34 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2015-07-02 07:58:34 -0700
commit21271c84ef78b1aac3b1708dbc9bf7c7a167b71d (patch)
treee9660ea90e859a57f64da32cdb03a768fde54641 /lib/chef/mixin/deep_merge.rb
parentfc93eb7730112c46a8fbb4c30dbdf3641d142870 (diff)
parent19c35a8f61801c0964682dbb7832c33a4e07a557 (diff)
downloadchef-21271c84ef78b1aac3b1708dbc9bf7c7a167b71d.tar.gz
Merge pull request #3626 from chef/revert-3606-jdm/pin-ffi
Revert "FFI 1.9.9 is causing segfaults"
Diffstat (limited to 'lib/chef/mixin/deep_merge.rb')
0 files changed, 0 insertions, 0 deletions