diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-31 13:10:36 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-31 13:10:36 -0700 |
| commit | dfa160ef7380e41e509e894a0aaf8a882a1ef599 (patch) | |
| tree | 2a264d1145cb054246b14bdf27136c9b574d234c /tools/dockerfile/grpc_interop_cxx | |
| parent | 65938df105732f9be3d379b69fbea91262761a23 (diff) | |
| parent | bbf85f4ee7b3cfafaff22b36fe7e2c404124131c (diff) | |
Merge branch 'optionalize_census' into optionalize_resolvers
Diffstat (limited to 'tools/dockerfile/grpc_interop_cxx')
| -rw-r--r-- | tools/dockerfile/grpc_interop_cxx/Dockerfile | 2 | ||||
| -rwxr-xr-x | tools/dockerfile/grpc_interop_cxx/build_interop.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/dockerfile/grpc_interop_cxx/Dockerfile b/tools/dockerfile/grpc_interop_cxx/Dockerfile index 58a8c32e34..1fa1907533 100644 --- a/tools/dockerfile/grpc_interop_cxx/Dockerfile +++ b/tools/dockerfile/grpc_interop_cxx/Dockerfile @@ -1,4 +1,4 @@ -# 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/tools/dockerfile/grpc_interop_cxx/build_interop.sh b/tools/dockerfile/grpc_interop_cxx/build_interop.sh index 903c31b3e7..1c0828d23a 100755 --- a/tools/dockerfile/grpc_interop_cxx/build_interop.sh +++ b/tools/dockerfile/grpc_interop_cxx/build_interop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without |