diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 01:14:17 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 01:14:17 +0200 |
| commit | b457cd831ad519d5ec023005ba6ccfb52ff4c9cb (patch) | |
| tree | 75575c3da2adaf0e44a382558428b0eb47f5ab43 /src/cpp/common | |
| parent | f0b417dc84d52ebd3890751b0ee331f9eee49e37 (diff) | |
| parent | 73578f7f62df4fd03035ad8e04c43b492649a064 (diff) | |
Merge remote-tracking branch 'google/master' into the-ultimate-showdown
Conflicts:
src/csharp/ext/grpc_csharp_ext.c
Diffstat (limited to 'src/cpp/common')
| -rw-r--r-- | src/cpp/common/auth_property_iterator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/common/auth_property_iterator.cc b/src/cpp/common/auth_property_iterator.cc index e706c6c921..ba88983515 100644 --- a/src/cpp/common/auth_property_iterator.cc +++ b/src/cpp/common/auth_property_iterator.cc @@ -31,7 +31,7 @@ * */ -#include <grpc++/auth_property_iterator.h> +#include <grpc++/auth_context.h> #include <grpc/grpc_security.h> |