diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-12 16:59:00 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-12 16:59:00 -0700 |
| commit | 5e1b58bcea0d34a5e21e990cf98b64f432b87121 (patch) | |
| tree | 9a227e98b72243ff2565db2da8e86d7a29085f4a /src/core/lib/iomgr/error.c | |
| parent | 242dc4be0e58a974f5f5852f498b0d55e0771887 (diff) | |
| parent | 6e51f992c6bfdfba61d984ab173305da455bd2e7 (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'src/core/lib/iomgr/error.c')
| -rw-r--r-- | src/core/lib/iomgr/error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/error.c b/src/core/lib/iomgr/error.c index 29b322dced..e13f37f8ed 100644 --- a/src/core/lib/iomgr/error.c +++ b/src/core/lib/iomgr/error.c @@ -391,7 +391,7 @@ grpc_error *grpc_error_add_child(grpc_error *src, grpc_error *child) { return new; } -static const char *no_error_string = "\"No Error\""; +static const char *no_error_string = "null"; static const char *oom_error_string = "\"Out of memory\""; static const char *cancelled_error_string = "\"Cancelled\""; |