diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-06 14:43:06 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-06 14:43:06 -0700 |
| commit | f39f2d6ddef77b407bf17cb7be8c21cc5b37d889 (patch) | |
| tree | 1238134b8a02139de6ad2efbe809c73a2fe66772 /build.json | |
| parent | f50abfcbc246d9f338b800f2b1c2365520f34e3f (diff) | |
| parent | cce361f7ca984200b32738fda355fede7a2ecd58 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
test/core/bad_client/bad_client.c
test/core/httpcli/httpcli_test.c
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build.json b/build.json index 0ff85a5c0c..6f0560416e 100644 --- a/build.json +++ b/build.json @@ -1353,7 +1353,6 @@ { "name": "httpcli_test", "build": "test", - "run": false, "language": "c", "src": [ "test/core/httpcli/httpcli_test.c" |