diff options
| author |  yang-g <yangg@google.com> | 2016-01-13 08:53:16 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-13 08:53:16 -0800 |
| commit | 11493fbcc82a24f5aa9eeff2a08aa815d17e1145 (patch) | |
| tree | c2f15e8787c99cc58edc6ef7a58dedf99f54749c /test/cpp/end2end | |
| parent | 2623014c60498bd1cee10a6fc1f9b9df9dc20d4d (diff) | |
| parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) | |
Merge remote-tracking branch 'upstream/master' into epollset
Diffstat (limited to 'test/cpp/end2end')
| -rw-r--r-- | test/cpp/end2end/async_end2end_test.cc | 2 | ||||
| -rw-r--r-- | test/cpp/end2end/generic_end2end_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index dc07eb6777..62023b24fd 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.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 diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index f8ceca5f1d..14b534fbd2 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.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 |