diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-01 17:04:17 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-01 17:04:17 -0700 |
| commit | 8e0b08a33d819d0a2523ec439d545296e1ad2086 (patch) | |
| tree | 5613a61a51db9c5a5f7ecc5fec8cfd0eb0b2c436 /src/core/channel | |
| parent | 3c1331f920569ba3a182e13321db26796d6e920e (diff) | |
| parent | fa275a97b968060383fe27c26b1d85f08d9582f9 (diff) | |
Merge branch 'count-the-things' into we-dont-need-no-backup
Diffstat (limited to 'src/core/channel')
| -rw-r--r-- | src/core/channel/client_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/client_setup.c b/src/core/channel/client_setup.c index 6782ef515a..f305d8ba9e 100644 --- a/src/core/channel/client_setup.c +++ b/src/core/channel/client_setup.c @@ -96,7 +96,7 @@ static void setup_initiate(grpc_transport_setup *sp) { r->setup = s; grpc_pollset_set_init(&r->interested_parties); /* TODO(klempner): Actually set a deadline */ - r->deadline = gpr_inf_future; + r->deadline = gpr_time_add(gpr_now(), gpr_time_from_seconds(60)); gpr_mu_lock(&s->mu); GPR_ASSERT(s->refs > 0); |