Merge branch 'huh' of https://github.com/webframp/emeril into webfram…

…p-huh Conflicts: lib/emeril/publisher.rb
fnichol · Aug 6, 2014 · 0339c69 · 0339c69
2 parents a16e0b1 + bea5a97
commit 0339c69
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/emeril/publisher.rb b/lib/emeril/publisher.rb
@@ -5,6 +5,7 @@
 require "chef/cookbook_site_streaming_uploader"
 require "chef/knife/cookbook_site_share"
 require "chef/knife/core/ui"
+require "chef/mixin/command"
 require "fileutils"
 require "tmpdir"