diff options
| -rw-r--r-- | .github/CODEOWNERS | 15 | ||||
| -rw-r--r-- | src/core/OWNERS | 1 | ||||
| -rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c | 4 | ||||
| -rw-r--r-- | src/cpp/OWNERS | 1 | ||||
| -rw-r--r-- | src/python/grpcio/OWNERS | 3 | ||||
| -rw-r--r-- | test/core/OWNERS | 1 | ||||
| -rw-r--r-- | test/cpp/OWNERS | 1 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | 14 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | 14 |
9 files changed, 19 insertions, 35 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d122f00d77..66f201c955 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -15,20 +15,21 @@ /examples/node/** @murgatroid99 @a11r @nicolasnoble @ctiller /examples/python/** @nathanielmanistaatgoogle @kpayson64 @mehrdada /include/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/src/core/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/src/core/lib/iomgr/*_uv.c @murgatroid99 @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/src/core/lib/iomgr/*_uv.h @murgatroid99 @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/src/cpp/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble +/src/core/** @ctiller @markdroth @dgquintas +/src/core/lib/iomgr/*_uv.c @murgatroid99 @ctiller @markdroth @dgquintas +/src/core/lib/iomgr/*_uv.h @murgatroid99 @ctiller @markdroth @dgquintas +/src/cpp/** @ctiller @markdroth @dgquintas /src/csharp/** @jtattermusch @apolcyn @a11r @nicolasnoble @ctiller /src/node/** @murgatroid99 @a11r @nicolasnoble @ctiller /src/objective-c/** @muxi @makdharma @a11r @nicolasnoble @ctiller /src/php/** @stanley-cheung @murgatroid99 @a11r @nicolasnoble @ctiller /src/python/** @nathanielmanistaatgoogle @kpayson64 @mehrdada +/src/python/grpcio/grpc_core_dependencies.py @a11y @ctiller @nicolasnoble @nathanielmanistaatgoogle @kpayson64 @mehrdada /src/ruby/** @apolcyn @murgatroid99 @a11r @nicolasnoble @ctiller /test/build/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/test/core/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/test/cpp/** @ctiller @markdroth @dgquintas @a11r @nicolasnoble -/test/cpp/qps/** @vjpai @ctiller @markdroth @dgquintas @a11r @nicolasnoble +/test/core/** @ctiller @markdroth @dgquintas +/test/cpp/** @ctiller @markdroth @dgquintas +/test/cpp/qps/** @vjpai @ctiller @markdroth @dgquintas /test/distrib/node/** @murgatroid99 @a11r @nicolasnoble @ctiller /tools/** @matt-kwong @jtattermusch @nicolasnoble @a11r @ctiller /tools/codegen/core/** @ctiller @dgquintas @markdroth diff --git a/src/core/OWNERS b/src/core/OWNERS index 8dca75ce91..986c9a1c3c 100644 --- a/src/core/OWNERS +++ b/src/core/OWNERS @@ -1,3 +1,4 @@ +set noparent @ctiller @markdroth @dgquintas diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c index 244b260dfa..9065e33613 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c @@ -236,12 +236,12 @@ static void on_srv_query_done_cb(void *arg, int status, int timeouts, srv_it = srv_it->next) { if (grpc_ipv6_loopback_available()) { grpc_ares_hostbyname_request *hr = create_hostbyname_request( - r, srv_it->host, srv_it->port, true /* is_balancer */); + r, srv_it->host, htons(srv_it->port), true /* is_balancer */); ares_gethostbyname(*channel, hr->host, AF_INET6, on_hostbyname_done_cb, hr); } grpc_ares_hostbyname_request *hr = create_hostbyname_request( - r, srv_it->host, srv_it->port, true /* is_balancer */); + r, srv_it->host, htons(srv_it->port), true /* is_balancer */); ares_gethostbyname(*channel, hr->host, AF_INET, on_hostbyname_done_cb, hr); grpc_ares_ev_driver_start(&exec_ctx, r->ev_driver); diff --git a/src/cpp/OWNERS b/src/cpp/OWNERS index 8dca75ce91..986c9a1c3c 100644 --- a/src/cpp/OWNERS +++ b/src/cpp/OWNERS @@ -1,3 +1,4 @@ +set noparent @ctiller @markdroth @dgquintas diff --git a/src/python/grpcio/OWNERS b/src/python/grpcio/OWNERS new file mode 100644 index 0000000000..78d54ec96b --- /dev/null +++ b/src/python/grpcio/OWNERS @@ -0,0 +1,3 @@ +@a11y grpc_core_dependencies.py +@ctiller grpc_core_dependencies.py +@nicolasnoble grpc_core_dependencies.py diff --git a/test/core/OWNERS b/test/core/OWNERS index 8dca75ce91..986c9a1c3c 100644 --- a/test/core/OWNERS +++ b/test/core/OWNERS @@ -1,3 +1,4 @@ +set noparent @ctiller @markdroth @dgquintas diff --git a/test/cpp/OWNERS b/test/cpp/OWNERS index 8dca75ce91..986c9a1c3c 100644 --- a/test/cpp/OWNERS +++ b/test/cpp/OWNERS @@ -1,3 +1,4 @@ +set noparent @ctiller @markdroth @dgquintas diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile index c667655afb..0251b2b392 100644 --- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile @@ -49,19 +49,7 @@ RUN apt-get update && apt-key update && apt-get install -y \ # Install Node dependencies RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 4 && npm install -g node-pre-gyp" - -################## -# Python dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -RUN pip install pip --upgrade -RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 +RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" ################## diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile index 79f230186f..2d179c8c45 100644 --- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile @@ -49,19 +49,7 @@ RUN apt-get update && apt-key update && apt-get install -y \ # Install Node dependencies RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 4 && npm install -g node-pre-gyp" - -################## -# Python dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -RUN pip install pip --upgrade -RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 +RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" ################## |