diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-14 13:12:30 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-14 13:12:30 -0700 |
| commit | f294934ec4d3766824349358ba235c11a1cbb47a (patch) | |
| tree | 46a1697686d6183a82b465c5b5ad9a49de170923 /src/core/lib/security | |
| parent | bfa041a56d211b4b40360a5e00fda1c638a52fd3 (diff) | |
| parent | e412a180602753972ac496560322e224a5db987f (diff) | |
Merge github.com:grpc/grpc into framing_costs
Diffstat (limited to 'src/core/lib/security')
| -rw-r--r-- | src/core/lib/security/credentials/credentials.c | 1 | ||||
| -rw-r--r-- | src/core/lib/security/credentials/ssl/ssl_credentials.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/core/lib/security/credentials/credentials.c b/src/core/lib/security/credentials/credentials.c index 52b80141d1..d89da47fc1 100644 --- a/src/core/lib/security/credentials/credentials.c +++ b/src/core/lib/security/credentials/credentials.c @@ -37,7 +37,6 @@ #include <string.h> #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/http_client_filter.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/parser.h" #include "src/core/lib/iomgr/executor.h" diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.c b/src/core/lib/security/credentials/ssl/ssl_credentials.c index 4b17ac8098..b63bb6b6e9 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.c +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.c @@ -36,7 +36,6 @@ #include <string.h> #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/http_client_filter.h" #include "src/core/lib/surface/api_trace.h" #include <grpc/support/alloc.h> |