diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-01 16:21:18 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-01 16:21:18 -0700 |
| commit | 42ce225d50534f2bd6e24c47963896f096e1cb5f (patch) | |
| tree | 62e1611cd5f6d50e7b2924f0bd88ece373870e1a /build.json | |
| parent | 85c2a08ca6e008589f660113de5d8d3b7df74b85 (diff) | |
| parent | 7716c53a217292f1982d986e4681c1e2b25f4367 (diff) | |
Merge github.com:grpc/grpc into plucking-hell
Conflicts:
Makefile
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build.json b/build.json index 72457a493d..9c27c377a1 100644 --- a/build.json +++ b/build.json @@ -135,6 +135,8 @@ "src/core/client_config/resolvers/sockaddr_resolver.h", "src/core/client_config/subchannel.h", "src/core/client_config/subchannel_factory.h", + "src/core/client_config/subchannel_factory_decorators/add_channel_arg.h", + "src/core/client_config/subchannel_factory_decorators/merge_channel_args.h", "src/core/client_config/uri_parser.h", "src/core/compression/message_compress.h", "src/core/debug/trace.h", @@ -230,6 +232,8 @@ "src/core/client_config/resolvers/sockaddr_resolver.c", "src/core/client_config/subchannel.c", "src/core/client_config/subchannel_factory.c", + "src/core/client_config/subchannel_factory_decorators/add_channel_arg.c", + "src/core/client_config/subchannel_factory_decorators/merge_channel_args.c", "src/core/client_config/uri_parser.c", "src/core/compression/algorithm.c", "src/core/compression/message_compress.c", |