Merge pull request #222 from github/1-6-0

1.6.0
github · Oct 31, 2019 · 8d4b413 · 8d4b413
2 parents 2ba160e + 14d021f
commit 8d4b413
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.5.4
+1.6.0
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -8,6 +8,16 @@
 </tr>
 </thead><tbody>
 
+<tr valign=top>
+<td>1.6.0</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>
+<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>

diff --git 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