diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
| commit | 4b5b019d5644affef122e06c6898811286850b8d (patch) | |
| tree | 73c601dc31c436e3d800a846d08b9ace7ff05235 /src/cpp/server/server_builder.cc | |
| parent | b8f030bc0b507903e9d156fb44d161015273d0c6 (diff) | |
| parent | ee65a5eaee45a765d1d4176a797bb8288faeb180 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-subchannels
Diffstat (limited to 'src/cpp/server/server_builder.cc')
| -rw-r--r-- | src/cpp/server/server_builder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index e0b9b7a62b..8417c45e64 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -263,7 +263,7 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { std::unique_ptr<Server> server(new Server( max_receive_message_size_, &args, sync_server_cqs, sync_server_settings_.min_pollers, sync_server_settings_.max_pollers, - sync_server_settings_.cq_timeout_msec)); + sync_server_settings_.cq_timeout_msec, resource_quota_)); if (has_sync_methods) { // This is a Sync server |