diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
| commit | 92b3f568dbd1bf15c85cddac8d8f57a5a58201ef (patch) | |
| tree | 57cbb547c3e2feee2737df86382b422d37ebb3c0 /test/core/security | |
| parent | c63a09eb6ceb547c73b674f48a5833412cd5f08f (diff) | |
| parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) | |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'test/core/security')
| -rw-r--r-- | test/core/security/credentials_test.c | 2 | ||||
| -rw-r--r-- | test/core/security/security_connector_test.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index fd9ccbf45d..3a6b9696ab 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -47,8 +47,8 @@ #include "src/core/http/httpcli.h" #include "src/core/security/json_token.h" #include "src/core/support/env.h" -#include "src/core/support/tmpfile.h" #include "src/core/support/string.h" +#include "src/core/support/tmpfile.h" #include "test/core/util/test_config.h" /* -- Mock channel credentials. -- */ diff --git a/test/core/security/security_connector_test.c b/test/core/security/security_connector_test.c index 609d874fd1..31a56ea723 100644 --- a/test/core/security/security_connector_test.c +++ b/test/core/security/security_connector_test.c @@ -43,8 +43,8 @@ #include "src/core/security/security_connector.h" #include "src/core/security/security_context.h" #include "src/core/support/env.h" -#include "src/core/support/tmpfile.h" #include "src/core/support/string.h" +#include "src/core/support/tmpfile.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "test/core/util/test_config.h" |