diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-08-30 22:01:33 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-08-30 22:01:33 -0700 |
| commit | d1b6152f886e17ffb29e997fbd0ff647322fa379 (patch) | |
| tree | e4441193305cc085baa92c1be08366d595613b66 /Makefile | |
| parent | fe1478f19e0bf8d7f26ecd3f3b02b25b2fbd86d0 (diff) | |
| parent | 8c0d6b37a115fa20d2abded045cdabe29e87f59e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -4149,7 +4149,9 @@ LIBGRPC_SRC = \ src/core/transport/transport_op_string.c \ src/core/census/context.c \ src/core/census/initialize.c \ + src/core/census/operation.c \ src/core/census/record_stat.c \ + src/core/census/tracing.c \ PUBLIC_HEADERS_C += \ include/grpc/grpc_security.h \ @@ -4423,7 +4425,9 @@ LIBGRPC_UNSECURE_SRC = \ src/core/transport/transport_op_string.c \ src/core/census/context.c \ src/core/census/initialize.c \ + src/core/census/operation.c \ src/core/census/record_stat.c \ + src/core/census/tracing.c \ PUBLIC_HEADERS_C += \ include/grpc/byte_buffer.h \ |