diff options
author | Vijay Pai <vpai@google.com> | 2016-01-11 10:33:39 -0800 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-01-11 10:33:39 -0800 |
commit | 5bd6f2e190f7cdf2857bff27cd4da860acf72aef (patch) | |
tree | 780fa9aeaaeafe60ede359b12a49f76935cc1381 /test/cpp/qps/qps_worker.cc | |
parent | b30bc2aad6438cf89c11569fac436c83a7133f4b (diff) | |
parent | b3a6787bd52a9fe4a68114cbe5cd45926287da17 (diff) |
Merge branch 'master' into bbuf
Diffstat (limited to 'test/cpp/qps/qps_worker.cc')
-rw-r--r-- | test/cpp/qps/qps_worker.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index 765dea8d8d..ef2b633f68 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -55,7 +55,7 @@ #include "test/cpp/qps/client.h" #include "test/cpp/qps/server.h" #include "test/cpp/util/create_test_channel.h" -#include "test/proto/benchmarks/services.pb.h" +#include "src/proto/grpc/testing/services.pb.h" namespace grpc { namespace testing { |