Skip to content

1.6.0 #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahayworth merged 13 commits into from
Oct 31, 2019
Merged

1.6.0 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c0e7364
Merge branch 'speer-fix-compatibility-issue-hashdiff-1.0.0' into 1-6-0
ahayworth Oct 28, 2019
99ef1f1
Merge branch 'isaiahfrantz-parallel_conflict_with_diffy' into 1-6-0
ahayworth Oct 28, 2019
6fad2bc
Merge branch 'master' into 1-6-0
ahayworth Oct 28, 2019
f0a0617
Merge branch 'master' into 1-6-0
ahayworth Oct 30, 2019
6be115c
Merge branch 'master' into 1-6-0
ahayworth Oct 30, 2019
d535d57
Merge branch 'waipeng-hide_sensitive' into 1-6-0
ahayworth Oct 30, 2019
02018ba
1.6.0: fix tests for sensitive content diffing
ahayworth Oct 30, 2019
95fa964
Merge branch 'seanmil-glob_modulepath_support' into 1-6-0
ahayworth Oct 30, 2019
1c63d25
Force CI
ahayworth Oct 30, 2019
a5dabdf
Update version and changelog for 1.6.0
ahayworth Oct 30, 2019
c5d62ed
Fix date
ahayworth Oct 30, 2019
e1da895
Merge branch 'master' into 1-6-0
ahayworth Oct 31, 2019
14d021f
Merge branch 'master' into 1-6-0
ahayworth Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.4
1.6.0
10 changes: 10 additions & 0 deletions doc/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spec/octocatalog-diff/tests/catalog-diff/differ_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down