diff options
author | 2015-07-26 12:55:47 -0700 | |
---|---|---|
committer | 2015-07-26 12:55:47 -0700 | |
commit | d9aed1d0103122c235c5577f7a00ead9cbc1a7b9 (patch) | |
tree | c28b50ccab7a19287984857daf40d552e50247ab /src/node/ext/server.cc | |
parent | 7cb085375581ff2b18865e4e72b335276d08d09d (diff) | |
parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) |
Merge github.com:grpc/grpc into elliptic-orange-chamelion
Conflicts:
src/csharp/ext/grpc_csharp_ext.c
Diffstat (limited to 'src/node/ext/server.cc')
-rw-r--r-- | src/node/ext/server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/ext/server.cc b/src/node/ext/server.cc index 34cde9ffab..8554fce777 100644 --- a/src/node/ext/server.cc +++ b/src/node/ext/server.cc @@ -108,7 +108,7 @@ class NewCallOp : public Op { protected: std::string GetTypeString() const { - return "new call"; + return "new_call"; } }; |