diff options
author | Vijay Pai <vpai@google.com> | 2018-02-21 10:24:15 -0800 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2018-02-21 10:24:15 -0800 |
commit | a8453a20d8565ad63ca9ebcdc1b981400a7b09a0 (patch) | |
tree | b554248cd31da09f9120ead2fe9e6eca23ccfa68 /build.yaml | |
parent | 57c52eebce27bd104ae130e72c3833f361b11919 (diff) | |
parent | 5262c087d88123c0f69603f42b6401a4b8fa9282 (diff) |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'build.yaml')
-rw-r--r-- | build.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build.yaml b/build.yaml index e6b8f65c28..1f1f780d10 100644 --- a/build.yaml +++ b/build.yaml @@ -517,7 +517,6 @@ filegroups: - name: grpc_lb_policy_grpclb headers: - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h @@ -538,7 +537,6 @@ filegroups: - name: grpc_lb_policy_grpclb_secure headers: - src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h - - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h - src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h - src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h @@ -649,10 +647,10 @@ filegroups: - src/core/lib/security/credentials/oauth2/oauth2_credentials.h - src/core/lib/security/credentials/plugin/plugin_credentials.h - src/core/lib/security/credentials/ssl/ssl_credentials.h + - src/core/lib/security/security_connector/security_connector.h - src/core/lib/security/transport/auth_filters.h - src/core/lib/security/transport/lb_targets_info.h - src/core/lib/security/transport/secure_endpoint.h - - src/core/lib/security/transport/security_connector.h - src/core/lib/security/transport/security_handshaker.h - src/core/lib/security/transport/tsi_error.h - src/core/lib/security/util/json_util.h @@ -672,10 +670,10 @@ filegroups: - src/core/lib/security/credentials/oauth2/oauth2_credentials.cc - src/core/lib/security/credentials/plugin/plugin_credentials.cc - src/core/lib/security/credentials/ssl/ssl_credentials.cc + - src/core/lib/security/security_connector/security_connector.cc - src/core/lib/security/transport/client_auth_filter.cc - src/core/lib/security/transport/lb_targets_info.cc - src/core/lib/security/transport/secure_endpoint.cc - - src/core/lib/security/transport/security_connector.cc - src/core/lib/security/transport/security_handshaker.cc - src/core/lib/security/transport/server_auth_filter.cc - src/core/lib/security/transport/tsi_error.cc |