Merge branch 'stable'

puppetlabs · Jan 26, 2016 · a6f1818 · a6f1818
2 parents f69c921 + b7c33ee
commit a6f1818
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/acceptance/tests/ticket_1238_hostname_fqdn.rb b/acceptance/tests/ticket_1238_hostname_fqdn.rb
@@ -14,6 +14,7 @@
 
   step 'set hostname as fqdn' do
     on(agent, "hostname #{fqdn}")
+    sleep 1 # on Solaris 11 hostname returns before the hostname is updated
   end
 
   step 'validate facter honors fqdn' do