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 /grpc.gyp | |
| parent | 57c52eebce27bd104ae130e72c3833f361b11919 (diff) | |
| parent | 5262c087d88123c0f69603f42b6401a4b8fa9282 (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -398,10 +398,10 @@ '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', |