Merge branch 'master' into 1.x

Conflicts: librarian-puppet.gemspec
rodjek · Mar 2, 2015 · b80efcf · b80efcf
2 parents 881b765 + 2bf327b
commit b80efcf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/librarian-puppet.gemspec b/librarian-puppet.gemspec
@@ -26,9 +26,9 @@ Gem::Specification.new do |s|
 
   s.executables = ['librarian-puppet']
 
-  s.add_dependency "librarianp", ">=0.5.0"
-  # s.add_dependency "puppet_forge"
+  s.add_dependency "librarianp", ">=0.5.1"
   s.add_dependency "rsync"
+  # s.add_dependency "puppet_forge"
 
   # only needed for ruby 1.8
   s.add_dependency "json"