Skip to content

Commit 8d4b413

Browse files
authored
Merge pull request #222 from github/1-6-0
1.6.0
2 parents 2ba160e + 14d021f commit 8d4b413

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

Diff for: .version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.4
1+
1.6.0

Diff for: doc/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
</tr>
99
</thead><tbody>
1010

11+
<tr valign=top>
12+
<td>1.6.0</td>
13+
<td>2019-10-31</td>
14+
<li><a href="https://github.com/github/octocatalog-diff/pull/216">#216</a>: (Enhancement) Hide sensitive parameters</li>
15+
<li><a href="https://github.com/github/octocatalog-diff/pull/204">#204</a>: (Enhancement) Add glob support for modulepath</li>
16+
<li><a href="https://github.com/github/octocatalog-diff/pull/206">#206</a>: (Bug Fix) Fix multi-node list with parallel mode</li>
17+
<li><a href="https://github.com/github/octocatalog-diff/pull/215">#215</a>: (Bug Fix) Add Support for Hashdiff 1.0.0</li>
18+
</td>
19+
</tr>
20+
1121
<tr valign=top>
1222
<td>1.5.4</td>
1323
<td>2018-12-11</td>

Diff for: spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
catalog = OctocatalogDiff::Catalog.create(json: JSON.generate(json_hash))
405405
testobj = OctocatalogDiff::CatalogDiff::Differ.new(@options, catalog, @empty_puppet_catalog)
406406
result = testobj.catalog1
407-
expect(result.first['parameters']['content']).to eq('Sensitive [md5sum e52d98c459819a11775936d8dfbb7929]')
407+
expect(result.first['parameters']['content']).to eq('Sensitive [md5sum 05183a01bf8570c7691fc4e362998f3d]')
408408
end
409409
end
410410

0 commit comments

Comments
 (0)