From 16fadb885e08c7c92444d355b1c7be8decf83914 Mon Sep 17 00:00:00 2001
From: "Eric G. Wolfe" <eric.wolfe@gmail.com>
Date: Thu, 5 Feb 2015 11:14:42 -0500
Subject: [PATCH] v0.8.1

* Fix bad pick on merge conflict from revert.
---
 CHANGELOG.md        | 5 +++++
 providers/manage.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b75d9..f54fb3c 100644
--- 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
index 79a262f..11522ab 100644
--- 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