Merge github.com:grpc/grpc into cleaner-posix2

1 files changed, 11 insertions, 1 deletions

diff --git a/package.xml b/package.xml
index 0920fa1fe2..d5c5b84040 100644
--- a/package.xml
+++ b/package.xml
@@ -93,6 +93,7 @@
     <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_win32.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/impl/codegen/time.h" role="src" />
     <file baseinstalldir="/" name="src/core/profiling/timers.h" role="src" />
+    <file baseinstalldir="/" name="src/core/support/backoff.h" role="src" />
     <file baseinstalldir="/" name="src/core/support/block_annotate.h" role="src" />
     <file baseinstalldir="/" name="src/core/support/env.h" role="src" />
     <file baseinstalldir="/" name="src/core/support/load_file.h" role="src" />
@@ -107,6 +108,7 @@
     <file baseinstalldir="/" name="src/core/profiling/stap_timers.c" role="src" />
     <file baseinstalldir="/" name="src/core/support/alloc.c" role="src" />
     <file baseinstalldir="/" name="src/core/support/avl.c" role="src" />
+    <file baseinstalldir="/" name="src/core/support/backoff.c" role="src" />
     <file baseinstalldir="/" name="src/core/support/cmdline.c" role="src" />
     <file baseinstalldir="/" name="src/core/support/cpu_iphone.c" role="src" />
     <file baseinstalldir="/" name="src/core/support/cpu_linux.c" role="src" />
@@ -160,8 +162,10 @@
     <file baseinstalldir="/" name="include/grpc/impl/codegen/status.h" role="src" />
     <file baseinstalldir="/" name="include/grpc/census.h" role="src" />
     <file baseinstalldir="/" name="src/core/census/grpc_filter.h" role="src" />
+    <file baseinstalldir="/" name="src/core/census/grpc_plugin.h" role="src" />
     <file baseinstalldir="/" name="src/core/channel/channel_args.h" role="src" />
     <file baseinstalldir="/" name="src/core/channel/channel_stack.h" role="src" />
+    <file baseinstalldir="/" name="src/core/channel/channel_stack_builder.h" role="src" />
     <file baseinstalldir="/" name="src/core/channel/client_channel.h" role="src" />
     <file baseinstalldir="/" name="src/core/channel/client_uchannel.h" role="src" />
     <file baseinstalldir="/" name="src/core/channel/compress_filter.h" role="src" />
@@ -240,9 +244,12 @@
     <file baseinstalldir="/" name="src/core/surface/call.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/call_test_only.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/channel.h" role="src" />
+    <file baseinstalldir="/" name="src/core/surface/channel_init.h" role="src" />
+    <file baseinstalldir="/" name="src/core/surface/channel_stack_type.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/completion_queue.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/event_string.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/init.h" role="src" />
+    <file baseinstalldir="/" name="src/core/surface/lame_client.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/server.h" role="src" />
     <file baseinstalldir="/" name="src/core/surface/surface_trace.h" role="src" />
     <file baseinstalldir="/" name="src/core/transport/byte_stream.h" role="src" />
@@ -296,8 +303,10 @@
     <file baseinstalldir="/" name="third_party/nanopb/pb_encode.h" role="src" />
     <file baseinstalldir="/" name="src/core/census/grpc_context.c" role="src" />
     <file baseinstalldir="/" name="src/core/census/grpc_filter.c" role="src" />
+    <file baseinstalldir="/" name="src/core/census/grpc_plugin.c" role="src" />
     <file baseinstalldir="/" name="src/core/channel/channel_args.c" role="src" />
     <file baseinstalldir="/" name="src/core/channel/channel_stack.c" role="src" />
+    <file baseinstalldir="/" name="src/core/channel/channel_stack_builder.c" role="src" />
     <file baseinstalldir="/" name="src/core/channel/client_channel.c" role="src" />
     <file baseinstalldir="/" name="src/core/channel/client_uchannel.c" role="src" />
     <file baseinstalldir="/" name="src/core/channel/compress_filter.c" role="src" />
@@ -382,7 +391,9 @@
     <file baseinstalldir="/" name="src/core/surface/channel.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/channel_connectivity.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/channel_create.c" role="src" />
+    <file baseinstalldir="/" name="src/core/surface/channel_init.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/channel_ping.c" role="src" />
+    <file baseinstalldir="/" name="src/core/surface/channel_stack_type.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/completion_queue.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/event_string.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/init.c" role="src" />
@@ -390,7 +401,6 @@
     <file baseinstalldir="/" name="src/core/surface/metadata_array.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/server.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/server_chttp2.c" role="src" />
-    <file baseinstalldir="/" name="src/core/surface/server_create.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/validate_metadata.c" role="src" />
     <file baseinstalldir="/" name="src/core/surface/version.c" role="src" />
     <file baseinstalldir="/" name="src/core/transport/byte_stream.c" role="src" />