diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-05 21:08:33 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-05 21:08:33 -0700 |
| commit | 27166a6f65581a9ee820882e5d7506d6bd07ade6 (patch) | |
| tree | 0e89c5e09a955b2a074a8b34e0f3fe0a4135f346 /src/core/census | |
| parent | 4efb6966bdfb62c725c6614b0d85ea374250bb51 (diff) | |
| parent | d1dd3a68a2d4af56f1409327c197590dac6968cb (diff) | |
Merge github.com:grpc/grpc into flow-like-lava-to-a-barnyard
Conflicts:
src/core/surface/call.c
src/core/transport/chttp2_transport.c
src/core/transport/transport.h
Diffstat (limited to 'src/core/census')
| -rw-r--r-- | src/core/census/context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/census/context.c b/src/core/census/context.c index 1358c5127b..df238ec98c 100644 --- a/src/core/census/context.c +++ b/src/core/census/context.c @@ -31,7 +31,7 @@ * */ -#include "context.h" +#include "src/core/census/context.h" #include <string.h> #include <grpc/census.h> |