diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-02-04 13:44:41 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-02-04 13:44:41 -0800 |
| commit | 53f16356b2820d795bdf1ab0e32e454c6b0ce3a9 (patch) | |
| tree | 647fc41f8a250775c86c3619345e4a722fc43167 /package.json | |
| parent | b781c9757dd95e416a649d21fdc8858f67ecefd2 (diff) | |
| parent | e4fdcd924263edca885b22122e9e7cf148c236fd (diff) | |
Resolved merge conflict with master
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/package.json b/package.json index 7ab4ea514b..59e18128ee 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "src/node/src/client.js", "src/node/src/common.js", "src/node/src/credentials.js", + "src/node/src/grpc_extension.js", "src/node/src/metadata.js", "src/node/src/server.js", "include/grpc/grpc_security.h", @@ -279,7 +280,6 @@ "src/core/support/thd_internal.h", "src/core/support/time_precise.h", "src/core/census/aggregation.h", - "src/core/census/context.h", "src/core/census/rpc_metric_id.h", "src/core/httpcli/httpcli_security_connector.c", "src/core/security/base64.c", @@ -476,7 +476,6 @@ "src/core/census/initialize.c", "src/core/census/operation.c", "src/core/census/placeholders.c", - "src/core/census/tag_set.c", "src/core/census/tracing.c", "third_party/zlib/crc32.h", "third_party/zlib/deflate.h", |