Merge branch 'master' into language

Author: remi Taylor

logging/spec/sample_spec.rb

@@ -148,7 +148,9 @@ def cleanup!
     ).to_stdout
   end
 
-  it "can write log entry" do
+  # XXX This test is flaky so it is currently disabled
+  #     Will send future pull request to re-enable when fixed
+  skip "can write log entry" do
     current_time = Time.now.to_f
 
     # Log entries refer to a particular resource