From 02018babe87fdda81d948a8d5838fb448f678ca3 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Wed, 30 Oct 2019 09:16:01 -0500
Subject: [PATCH 1/4] 1.6.0: fix tests for sensitive content diffing

---
 spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb b/spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb
index 7848f4df..32bde785 100644
--- a/spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb
+++ b/spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb
@@ -404,7 +404,7 @@
           catalog = OctocatalogDiff::Catalog.create(json: JSON.generate(json_hash))
           testobj = OctocatalogDiff::CatalogDiff::Differ.new(@options, catalog, @empty_puppet_catalog)
           result = testobj.catalog1
-          expect(result.first['parameters']['content']).to eq('Sensitive [md5sum e52d98c459819a11775936d8dfbb7929]')
+          expect(result.first['parameters']['content']).to eq('Sensitive [md5sum 05183a01bf8570c7691fc4e362998f3d]')
         end
       end
 

From 1c63d25c0d6bf25d4c45db322a4d77ab9dd1b5ce Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Wed, 30 Oct 2019 12:23:49 -0500
Subject: [PATCH 2/4] Force CI


From a5dabdf3d2a5e8ace65eafa76775a47f62cdc549 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Wed, 30 Oct 2019 14:33:54 -0500
Subject: [PATCH 3/4] Update version and changelog for 1.6.0

---
 .version         |  2 +-
 doc/CHANGELOG.md | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.version b/.version
index 94fe62c2..dc1e644a 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.5.4
+1.6.0
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index da2a10ba..ed4f07df 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -8,6 +8,16 @@
 </tr>
 </thead><tbody>
 
+<tr valign=top>
+<td>1.6.0</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/216">#216</a>: (Enhancement) Hide sensitive parameters</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/204">#204</a>: (Enhancement) Add glob support for modulepath</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/206">#206</a>: (Bug Fix) Fix multi-node list with parallel mode</li>
+<li><a href="https://github.com/github/octocatalog-diff/pull/215">#215</a>: (Bug Fix) Add Support for Hashdiff 1.0.0</li>
+</td>
+</tr>
+
 <tr valign=top>
 <td>1.5.4</td>
 <td>2018-12-11</td>

From c5d62eda11fd95d9103b56d52b773af9f42e6741 Mon Sep 17 00:00:00 2001
From: Andrew Hayworth <ahayworth@github.com>
Date: Wed, 30 Oct 2019 17:37:10 -0500
Subject: [PATCH 4/4] Fix date

---
 doc/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index ed4f07df..9cf3aab5 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 <tr valign=top>
 <td>1.6.0</td>
-<td>
+<td>2019-10-31</td>
 <li><a href="https://github.com/github/octocatalog-diff/pull/216">#216</a>: (Enhancement) Hide sensitive parameters</li>
 <li><a href="https://github.com/github/octocatalog-diff/pull/204">#204</a>: (Enhancement) Add glob support for modulepath</li>
 <li><a href="https://github.com/github/octocatalog-diff/pull/206">#206</a>: (Bug Fix) Fix multi-node list with parallel mode</li>