diff options
| author |  yang-g <yangg@google.com> | 2016-01-15 16:08:20 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-15 16:08:20 -0800 |
| commit | a49474e2cb1fec509d1de3c83ef3c0c9eeb95065 (patch) | |
| tree | 0d0b2abceca4654adef6259748a3ffc2c688d466 /test/cpp | |
| parent | 5d7b6a21dfe6edc2328022c5804ebd5ffdc4fe9f (diff) | |
| parent | a0fffb7bfb4b9ad7e51395a3a818518c3134a2e0 (diff) | |
Merge remote-tracking branch 'upstream/master' into epollset
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/util/subprocess.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/util/subprocess.cc b/test/cpp/util/subprocess.cc index d758f629ac..33f3820a2b 100644 --- a/test/cpp/util/subprocess.cc +++ b/test/cpp/util/subprocess.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,4 +56,4 @@ int SubProcess::Join() { return gpr_subprocess_join(subprocess_); } void SubProcess::Interrupt() { gpr_subprocess_interrupt(subprocess_); } -} // namespace grpc
\ No newline at end of file +} // namespace grpc |