Merge remote-tracking branch 'upstream/master'

aeb9ead0 · Bogdan Drutu · a505408e · eced528e · aeb9ead0 · aeb9ead0
Commit aeb9ead0 authored 9 years ago by Bogdan Drutu
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [gRPC - An RPC library and framework](http://github.com/grpc/grpc)
 ===================================

-Copyright 2015 Google Inc.
+Copyright 2015-2016 Google Inc.

 #Documentation


--- a/tools/run_tests/post_tests_ruby.sh
+++ b/tools/run_tests/post_tests_ruby.sh
@@ -43,4 +43,4 @@ genhtml $tmp2 --output-directory $out
 rm $tmp2
 rm $tmp1

-cp -rv $root/src/ruby/coverage $root/reports/ruby
+cp -rv $root/coverage $root/reports/ruby