Merge branch 'speer-fix-compatibility-issue-hashdiff-1.0.0' into 1-6-0

ahayworth · ahayworth · commit c0e7364b2133 · 2019-10-28T09:59:29.000-05:00
diff --git a/lib/octocatalog-diff/catalog-diff/differ.rb b/lib/octocatalog-diff/catalog-diff/differ.rb
@@ -11,6 +11,8 @@
 require_relative '../util/util'
 require_relative 'filter'
 
+HashDiff = Hashdiff unless defined? HashDiff
+
 module OctocatalogDiff
   module CatalogDiff
     # Calculate the difference between two Puppet catalogs.
