v0.8.1

* Fix bad pick on merge conflict from revert.
sous-chefs · Feb 5, 2015 · 16fadb8 · 16fadb8
1 parent 000802f
commit 16fadb8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 certificate cookbook changelog
 ==============================
 
+v0.8.1
+------
+
+* Fix bad pick on merge conflict from revert.
+
 v0.8.0
 ------
 

diff --git a/providers/manage.rb b/providers/manage.rb
@@ -27,7 +27,7 @@ def whyrun_supported?
   ssl_secret = Chef::EncryptedDataBagItem.load_secret(new_resource.data_bag_secret)
   ssl_item =
     begin
-      Chef::EncryptedDataBagItem.load(new_resource.data_bag, search_id, ssl_secret)
+      Chef::EncryptedDataBagItem.load(new_resource.data_bag, new_resource.search_id, ssl_secret)
     rescue => e
       raise e unless new_resource.ignore_missing
       nil