aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile/test/cxx_ubuntu1404_x64
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-04-05 00:30:40 +0200
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2016-04-05 00:30:40 +0200
commit6415043781e0b73008b3db539f18354fe776241a (patch)
tree78fc8db5eb33ac5cdea96b0a743a57c02e9b0109 /templates/tools/dockerfile/test/cxx_ubuntu1404_x64
parent1bb17d31cd00d70048c51c99ed5a827ea10389e6 (diff)
parent1b7c0a2c5cf27d7a77d9c3476fe6406a98ca3d76 (diff)
Merge branch 'master' of https://github.com/grpc/grpc into gpr_malloc_is_all
Diffstat (limited to 'templates/tools/dockerfile/test/cxx_ubuntu1404_x64')
-rw-r--r--templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
index d824220afe..fbed53930b 100644
--- a/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_ubuntu1404_x64/Dockerfile.template
@@ -1,6 +1,6 @@
%YAML 1.2
--- |
- # Copyright 2015-2016, Google Inc.
+ # Copyright 2015, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without