diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-28 00:01:16 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-28 00:01:16 +0200 |
| commit | acbd8675a283a51a409991ac1393294c9af726e7 (patch) | |
| tree | 01fa0ca4b463fd84edb3d3fbe2751ad76229b9d9 /test/cpp/end2end/shutdown_test.cc | |
| parent | 23df75a97054822e1a7f89ab5a0601d6bd4b3aa6 (diff) | |
| parent | cec42984a0374465de9b2626f16b0efa960a66d0 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzz
Diffstat (limited to 'test/cpp/end2end/shutdown_test.cc')
| -rw-r--r-- | test/cpp/end2end/shutdown_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index dbbda3ac51..aa8d42141d 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ #include <grpc/support/sync.h> #include <gtest/gtest.h> -#include "src/core/support/env.h" +#include "src/core/lib/support/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" |