voxpupuli / puppet-catalog_diff

📄↔📄 A tool to diff Puppet catalogs
https://forge.puppet.com/modules/puppet/catalog_diff/readme
Apache License 2.0
14 stars 16 forks source link

Improve viewer class (fully qualify ht_crypt) #88

Open DLeich opened 2 years ago

DLeich commented 2 years ago

Pull Request (PR) description

The viewer class was failing to compile when used on puppet 7. This is because the ht_crypt function usage needed to be fully qualified.

DLeich commented 2 years ago

Can I get a review on this? This PR replaces #58, which had to be reauthored due to a multitude of merge conflicts.

bastelfreak commented 2 years ago

@DLeich thanks for the work. can you please rebase against our master branch so the merge commit disappears?

DLeich commented 2 years ago

Okay this is odd. I just tested trying to rebase, and even just remove my commits for the README.md on a separate personal branch which worked, but on this branch & PR, it still adds them back, so now we have a number of extra commits which are unnecessary. Let me see if I can squash the last handful of commits to make this cleaner.

DLeich commented 2 years ago

@bastelfreak - got the rebase situation resolved. I think this is ready now.