diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-05 00:30:40 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-05 00:30:40 +0200 |
| commit | 6415043781e0b73008b3db539f18354fe776241a (patch) | |
| tree | 78fc8db5eb33ac5cdea96b0a743a57c02e9b0109 /tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile | |
| parent | 1bb17d31cd00d70048c51c99ed5a827ea10389e6 (diff) | |
| parent | 1b7c0a2c5cf27d7a77d9c3476fe6406a98ca3d76 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into gpr_malloc_is_all
Diffstat (limited to 'tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile')
| -rw-r--r-- | tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile index 18dbfd4657..0858fb0c06 100644 --- a/tools/dockerfile/distribtest/python_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/distribtest/python_ubuntu1404_x64/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 |