Merge github.com:google/grpc into nogo

1 files changed, 4 insertions, 4 deletions

diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc
index bcda4ed40c..ddda8c22d6 100644
--- a/src/cpp/client/channel.cc
+++ b/src/cpp/client/channel.cc
@@ -172,10 +172,10 @@ Status Channel::StartBlockingRpc(const RpcMethod& method,
   return status;
 }
 
-StreamContextInterface* Channel::CreateStream(const RpcMethod& method,
-                                              ClientContext* context,
-                                              const google::protobuf::Message* request,
-                                              google::protobuf::Message* result) {
+StreamContextInterface* Channel::CreateStream(
+    const RpcMethod& method, ClientContext* context,
+    const google::protobuf::Message* request,
+    google::protobuf::Message* result) {
   grpc_call* call = grpc_channel_create_call(
       c_channel_, method.name(), target_.c_str(), context->RawDeadline());
   context->set_call(call);