aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/csharp/Grpc.IntegrationTesting
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-10-25 22:02:02 +0200
committerGravatar GitHub <noreply@github.com>2016-10-25 22:02:02 +0200
commit9859ac469d3fe7515aafe964f972ac0fc1810bc9 (patch)
treeb78dd18a1034493e38b697be651ef797b26170d5 /src/csharp/Grpc.IntegrationTesting
parent6554eeeeab46f9b0f0fa459f81d30e611c4dddf7 (diff)
parent5fe5eba9694f1dc75b48ad89e906e10790d1daa3 (diff)
Merge pull request #8453 from jtattermusch/csharp_task_utils
Introduce framework independent replacement for CompletedTask
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting')
-rw-r--r--src/csharp/Grpc.IntegrationTesting/InterarrivalTimers.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/InterarrivalTimers.cs b/src/csharp/Grpc.IntegrationTesting/InterarrivalTimers.cs
index 6492d34890..8bea083bc2 100644
--- a/src/csharp/Grpc.IntegrationTesting/InterarrivalTimers.cs
+++ b/src/csharp/Grpc.IntegrationTesting/InterarrivalTimers.cs
@@ -69,7 +69,7 @@ namespace Grpc.IntegrationTesting
public Task WaitForNextAsync()
{
- return Task.FromResult<object>(null);
+ return TaskUtils.CompletedTask;
}
}