Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-in…

…terfaces
vg-hess · Jan 25, 2016 · 541db25 · 541db25
2 parents 2899114 + 22f6dcc
commit 541db25
Show file tree

Hide file tree

Showing 85 changed files with 3,575 additions and 1,518 deletions.
diff --git a/BUILD b/BUILD
@@ -421,6 +421,7 @@ cc_library(
     "src/core/census/context.c",
     "src/core/census/initialize.c",
     "src/core/census/operation.c",
+    "src/core/census/tag_set.c",
     "src/core/census/tracing.c",
   ],
   hdrs = [
@@ -696,6 +697,7 @@ cc_library(
     "src/core/census/context.c",
     "src/core/census/initialize.c",
     "src/core/census/operation.c",
+    "src/core/census/tag_set.c",
     "src/core/census/tracing.c",
   ],
   hdrs = [
@@ -1266,6 +1268,7 @@ objc_library(
     "src/core/census/context.c",
     "src/core/census/initialize.c",
     "src/core/census/operation.c",
+    "src/core/census/tag_set.c",
     "src/core/census/tracing.c",
   ],
   hdrs = [