diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-02-11 01:04:28 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-02-11 01:04:28 -0800 |
| commit | 742a783c0d39e78624ac6e61a435848e25d4f6f3 (patch) | |
| tree | 79e54c690b9755884aed29f0a7803555e08e976d /templates/tools | |
| parent | 7e46618897790b0808d676e18cee7c47e40ca0e5 (diff) | |
| parent | 4ea3d4c38a456f52774ee3d5236f4ded1d34d33b (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'templates/tools')
| -rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 1 | ||||
| -rw-r--r-- | templates/tools/doxygen/Doxyfile.core.internal.template | 2 | ||||
| -rw-r--r-- | templates/tools/doxygen/Doxyfile.core.template | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index bbdb848599..ad1d92e7cb 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -41,6 +41,7 @@ # Docker "inception" # Note this is quite the ugly hack. # This makes sure that the docker binary we inject has its dependencies. + RUN apt-get install libsystemd-journal0 RUN curl https://get.docker.com/ | sh RUN apt-get remove --purge -y docker-engine diff --git a/templates/tools/doxygen/Doxyfile.core.internal.template b/templates/tools/doxygen/Doxyfile.core.internal.template index ac30e0afc2..05be9d81aa 100644 --- a/templates/tools/doxygen/Doxyfile.core.internal.template +++ b/templates/tools/doxygen/Doxyfile.core.internal.template @@ -1,4 +1,4 @@ %YAML 1.2 --- | <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ - ${gen_doxyfile(['grpc'], 'Core', libs, True)} + ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)} diff --git a/templates/tools/doxygen/Doxyfile.core.template b/templates/tools/doxygen/Doxyfile.core.template index 679069bddc..8004294ec1 100644 --- a/templates/tools/doxygen/Doxyfile.core.template +++ b/templates/tools/doxygen/Doxyfile.core.template @@ -1,4 +1,4 @@ %YAML 1.2 --- | <%namespace file="Doxyfile.include" import="gen_doxyfile"/>\ - ${gen_doxyfile(['grpc'], 'Core', libs, False)} + ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)} |