diff options
author | David Garcia Quintas <dgq@google.com> | 2016-01-15 16:58:49 -0800 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-01-19 10:37:50 -0800 |
commit | 13e294e0909b8dd43e6bb5c38c8e88e24f3c9af6 (patch) | |
tree | 0b3bfaaf174dbe5e08d212570f9312aa38a03b05 /src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs | |
parent | d053ded310bda65ad1fdacd507cd85d46fb7f34c (diff) | |
parent | 7e098a272ccb2b2ac06464064cb59fca857e2e2a (diff) |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs')
-rw-r--r-- | src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs b/src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs index d90f21c2e1..a8a76c7492 100644 --- a/src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs +++ b/src/csharp/Grpc.HealthCheck.Tests/HealthClientServerTest.cs @@ -1,5 +1,5 @@ #region Copyright notice and license -// Copyright 2015, Google Inc. +// Copyright 2015-2016, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -93,4 +93,4 @@ namespace Grpc.HealthCheck.Tests // TODO(jtattermusch): add test with timeout once timeouts are supported } -}
\ No newline at end of file +} |