aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Bogdan Drutu <bdrutu@google.com>2016-01-25 10:26:07 -0800
committerGravatar Bogdan Drutu <bdrutu@google.com>2016-01-25 10:26:07 -0800
commitaeb9ead0e02e74fc5e3acc21e5dc70734577082d (patch)
treec7340be8ef05c816a0c602061a9284b21bb90f26
parenta505408efb9a887dc70438600233e9099bd2ac8d (diff)
parenteced528e28a82ac86a1d9eae3eb2d44212c4ab1d (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--README.md2
-rwxr-xr-xtools/run_tests/post_tests_ruby.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index e0553ecc86..f894def470 100644
--- 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
diff --git a/tools/run_tests/post_tests_ruby.sh b/tools/run_tests/post_tests_ruby.sh
index 66a9fbc534..0877e44805 100755
--- 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