diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-03-03 07:44:27 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-03-03 07:44:27 -0800 |
| commit | 01ea61e4823d9869090e18283409ac4447988cfc (patch) | |
| tree | 5d599cb0357394abd48d6e549f5c0275e2a1b428 /test/core/end2end | |
| parent | 7e0d99f72b5347b9266e4527ef3d6c27da2087b7 (diff) | |
| parent | 0cfc638d1955ddea4146864db8a2e0294f609249 (diff) | |
Merge github.com:grpc/grpc into credit
Conflicts:
build.json
src/cpp/client/credentials.cc
vsprojects/vs2013/grpc.vcxproj
vsprojects/vs2013/grpc.vcxproj.filters
vsprojects/vs2013/grpc_shared.vcxproj
vsprojects/vs2013/grpc_shared.vcxproj.filters
vsprojects/vs2013/grpc_unsecure.vcxproj
vsprojects/vs2013/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/no_server_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/end2end/no_server_test.c b/test/core/end2end/no_server_test.c index d953552c0a..ffc651ab05 100644 --- a/test/core/end2end/no_server_test.c +++ b/test/core/end2end/no_server_test.c @@ -41,7 +41,7 @@ static void *tag(gpr_intptr i) { return (void *)i; } int main(int argc, char **argv) { grpc_channel *chan; grpc_call *call; - gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5); + gpr_timespec deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(2); grpc_completion_queue *cq; cq_verifier *cqv; grpc_event *ev; |