diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-13 04:38:20 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-13 04:38:20 +0100 |
| commit | f083013bd741fbb7f0f8d99cf47ced34220fae8f (patch) | |
| tree | 39e586efe528419b36031fcf3a8797a9f1eca926 /test/distrib | |
| parent | 2d5e4dcaff6419f1e168738f46ffc15f165c2977 (diff) | |
| parent | 44753c39e1fd18da91d33e8747843befb8404b0d (diff) | |
Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13
Conflicts:
Makefile
build.yaml
package.json
setup.py
src/core/surface/version.c
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/build_packages.bat
src/python/grpcio/grpc_version.py
src/ruby/lib/grpc/version.rb
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'test/distrib')
| -rwxr-xr-x | test/distrib/node/run_distrib_test.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh index 99a51f01f7..9b8f15771b 100755 --- a/test/distrib/node/run_distrib_test.sh +++ b/test/distrib/node/run_distrib_test.sh @@ -38,6 +38,9 @@ nvm install $NODE_VERSION npm install -g node-static +# Kill off existing static servers +kill -9 $(ps aux | grep '[n]ode .*static' | awk '{print $2}') || true + STATIC_SERVER=127.0.0.1 STATIC_PORT=8080 |