diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
| commit | b70206fe52ee6509f3f965bf2a95b2cbd321088d (patch) | |
| tree | fa59a43171854465c89af72734d45350070b7366 /src/csharp | |
| parent | 295a7ce511f1a2145f70942f826d0e225c00ba62 (diff) | |
| parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) | |
Merge branch 'master' into release-0_12_master_merge
Diffstat (limited to 'src/csharp')
| -rwxr-xr-x | src/csharp/generate_proto_csharp.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/csharp/generate_proto_csharp.sh b/src/csharp/generate_proto_csharp.sh index 4dbd9c3308..3aeda21ba3 100755 --- a/src/csharp/generate_proto_csharp.sh +++ b/src/csharp/generate_proto_csharp.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -45,4 +45,4 @@ $PROTOC --plugin=$PLUGIN --csharp_out=$HEALTHCHECK_DIR --grpc_out=$HEALTHCHECK_D -I src/proto/grpc/health/v1alpha src/proto/grpc/health/v1alpha/health.proto $PROTOC --plugin=$PLUGIN --csharp_out=$TESTING_DIR --grpc_out=$TESTING_DIR \ - -I . test/proto/{empty,messages,test}.proto test/proto/benchmarks/*.proto + -I . src/proto/grpc/testing/{empty,messages,test}.proto test/proto/benchmarks/*.proto |