diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-01 16:36:27 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-01 16:36:27 -0700 |
| commit | 74071cdab0c9a4016c05d371fdf1ec0d772ed0b7 (patch) | |
| tree | 4cd5b95b661ddcdc33729622d5fdb63be4bb4f3a /package.xml | |
| parent | 92b74082811902e4ab9482a5229defd3014aad3f (diff) | |
| parent | b48dda25913fbf6fcb0a7c86ecc364beb31ff43b (diff) | |
Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into ccmerge
Diffstat (limited to 'package.xml')
| -rw-r--r-- | package.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.xml b/package.xml index 130b7ff897..bf27fcd399 100644 --- a/package.xml +++ b/package.xml @@ -168,6 +168,7 @@ <file baseinstalldir="/" name="src/core/ext/census/mlog.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/census/rpc_metric_id.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_config.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/connector.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.h" role="src" /> @@ -178,7 +179,6 @@ <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.h" role="src" /> - <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" /> @@ -307,6 +307,7 @@ <file baseinstalldir="/" name="src/core/ext/census/tracing.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/channel_connectivity.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/client_config.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/connector.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/default_initial_connect_string.c" role="src" /> @@ -318,7 +319,6 @@ <file baseinstalldir="/" name="src/core/ext/client_config/resolver_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/resolver_registry.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel.c" role="src" /> - <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/subchannel_index.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/client_config/uri_parser.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" /> |