diff options
author | David Garcia Quintas <dgq@google.com> | 2016-03-31 23:22:28 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-03-31 23:22:28 -0700 |
commit | 86fcfcc7b35cd4478603bb0a93711962b71b8c76 (patch) | |
tree | 0477d1674bf7fcad3713931d760d4214ddd5e89b /package.xml | |
parent | fcf7ad692cbd98a75d7dba53acf0ac8739a9da5e (diff) | |
parent | 7661da5b417130262ded988b2f881ab619d3b244 (diff) |
Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_lb_channel
Diffstat (limited to 'package.xml')
-rw-r--r-- | package.xml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/package.xml b/package.xml index c124181161..fc1791176a 100644 --- a/package.xml +++ b/package.xml @@ -161,6 +161,8 @@ <file baseinstalldir="/" name="include/grpc/impl/codegen/propagation_bits.h" role="src" /> <file baseinstalldir="/" name="include/grpc/impl/codegen/status.h" role="src" /> <file baseinstalldir="/" name="include/grpc/status.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/alpn.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.h" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.h" role="src" /> @@ -201,9 +203,6 @@ <file baseinstalldir="/" name="src/core/lib/client_config/client_config.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/connector.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/initial_connect_string.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/load_balancer_api.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/pick_first.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/round_robin.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_factory.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_registry.h" role="src" /> @@ -262,7 +261,6 @@ <file baseinstalldir="/" name="src/core/lib/json/json_common.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json_reader.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json_writer.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/auth_filters.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/b64.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/credentials.h" role="src" /> @@ -302,6 +300,10 @@ <file baseinstalldir="/" name="third_party/nanopb/pb_common.h" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_decode.h" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_encode.h" role="src" /> + <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/load_balancer_api.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/lb_policy/pick_first/pick_first.c" role="src" /> + <file baseinstalldir="/" name="src/core/ext/lb_policy/round_robin/round_robin.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/insecure/channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/secure/secure_channel_create.c" role="src" /> <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" /> @@ -350,9 +352,6 @@ <file baseinstalldir="/" name="src/core/lib/client_config/connector.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/default_initial_connect_string.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/initial_connect_string.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/load_balancer_api.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/pick_first.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/client_config/lb_policies/round_robin.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_factory.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/client_config/lb_policy_registry.c" role="src" /> @@ -417,7 +416,6 @@ <file baseinstalldir="/" name="src/core/lib/json/json_reader.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json_string.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/json/json_writer.c" role="src" /> - <file baseinstalldir="/" name="src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/b64.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/client_auth_filter.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/security/credentials.c" role="src" /> @@ -463,6 +461,7 @@ <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/ssl_transport_security.c" role="src" /> <file baseinstalldir="/" name="src/core/lib/tsi/transport_security.c" role="src" /> + <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.c" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_common.c" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_decode.c" role="src" /> <file baseinstalldir="/" name="third_party/nanopb/pb_encode.c" role="src" /> |