diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-28 13:21:31 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-28 13:21:31 -0700 |
| commit | 5db24978b6a710ebb38de9c006180a754e14a184 (patch) | |
| tree | db7b7cabcea181deef349cfa7491d17b5a186c6d /src/cpp | |
| parent | e8b87865b268856d5510abb6ffd044224c079c13 (diff) | |
| parent | b97f867b390193daf18988958183143726602727 (diff) | |
Merge remote-tracking branch 'upstream/master' into fail_fast
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/ext/reflection.grpc.pb.cc | 2 | ||||
| -rw-r--r-- | src/cpp/ext/reflection.pb.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/ext/reflection.grpc.pb.cc b/src/cpp/ext/reflection.grpc.pb.cc index b046dfc1b8..8139c8ea16 100644 --- a/src/cpp/ext/reflection.grpc.pb.cc +++ b/src/cpp/ext/reflection.grpc.pb.cc @@ -32,7 +32,7 @@ */ -// Generated by the gRPC protobuf plugin. +// Generated by tools/codegen/extensions/gen_reflection_proto.sh // If you make any local change, they will be lost. // source: reflection.proto diff --git a/src/cpp/ext/reflection.pb.cc b/src/cpp/ext/reflection.pb.cc index a84494f9a9..b50465b9b5 100644 --- a/src/cpp/ext/reflection.pb.cc +++ b/src/cpp/ext/reflection.pb.cc @@ -32,7 +32,7 @@ */ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by tools/codegen/extensions/gen_reflection_proto.sh // source: reflection.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION |