diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-31 14:01:53 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-31 14:01:53 -0700 |
| commit | 41dac846de147b42baf1da7535c236724ab576c6 (patch) | |
| tree | 21f4fbc5d12e5efd03e75aac6ad560e75a805797 /test/core/bad_ssl | |
| parent | 44ad3fdf060b5826416a14cc7d723eae64bacd9f (diff) | |
| parent | 02f5f8de36924b9fe55ccda800fa465b94bd181d (diff) | |
Merge github.com:grpc/grpc into ignore_connectivity
Diffstat (limited to 'test/core/bad_ssl')
| -rw-r--r-- | test/core/bad_ssl/bad_ssl_test.c | 2 | ||||
| -rwxr-xr-x | test/core/bad_ssl/gen_build_yaml.py | 2 | ||||
| -rw-r--r-- | test/core/bad_ssl/server_common.c | 2 | ||||
| -rw-r--r-- | test/core/bad_ssl/server_common.h | 2 | ||||
| -rw-r--r-- | test/core/bad_ssl/servers/alpn.c | 2 | ||||
| -rw-r--r-- | test/core/bad_ssl/servers/cert.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/test/core/bad_ssl/bad_ssl_test.c b/test/core/bad_ssl/bad_ssl_test.c index 9ea01bf548..c4ae212ec2 100644 --- a/test/core/bad_ssl/bad_ssl_test.c +++ b/test/core/bad_ssl/bad_ssl_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/test/core/bad_ssl/gen_build_yaml.py b/test/core/bad_ssl/gen_build_yaml.py index e2a3febe5d..69f921989c 100755 --- a/test/core/bad_ssl/gen_build_yaml.py +++ b/test/core/bad_ssl/gen_build_yaml.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2.7 -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/test/core/bad_ssl/server_common.c b/test/core/bad_ssl/server_common.c index cde844a552..14b1892c2e 100644 --- a/test/core/bad_ssl/server_common.c +++ b/test/core/bad_ssl/server_common.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/test/core/bad_ssl/server_common.h b/test/core/bad_ssl/server_common.h index 2566c25905..8ec7755503 100644 --- a/test/core/bad_ssl/server_common.h +++ b/test/core/bad_ssl/server_common.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/test/core/bad_ssl/servers/alpn.c b/test/core/bad_ssl/servers/alpn.c index 3225fd0315..8b69140fba 100644 --- a/test/core/bad_ssl/servers/alpn.c +++ b/test/core/bad_ssl/servers/alpn.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/test/core/bad_ssl/servers/cert.c b/test/core/bad_ssl/servers/cert.c index 7307682821..bd11efd314 100644 --- a/test/core/bad_ssl/servers/cert.c +++ b/test/core/bad_ssl/servers/cert.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |