Merge remote-tracking branch 'ansible-origin/devel' into devel

Conflicts: library/user
13 years ago · 5df542468d
parent 2f53b91697 6354752ded
commit 5df542468d
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -22,4 +22,4 @@
 #    facter
 #    ruby-json

-/usr/bin/facter --json
+/usr/bin/facter --json 2>/dev/null