Commit Graph

121 Commits

Author SHA1 Message Date
Craig Tiller ccdea1900f Separate timer checking from pollsets 2016-02-16 08:06:46 -08:00
Nicolas "Pixel" Noble f083013bd7 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
2016-02-13 04:38:20 +01:00
Nicolas "Pixel" Noble 6910ce8e01 Flagging 0.13.1-pre1. 2016-02-13 01:03:26 +01:00
Nicolas "Pixel" Noble 7a925f7f5e Flagging the release. 2016-02-13 00:39:12 +01:00
murgatroid99 9ab6d0c425 Ensure we use local node-pre-gyp in Node install hook 2016-02-12 13:36:39 -08:00
Craig Tiller eb841e2010 Revert "Revert "Proto API for LB request/responses"" 2016-02-11 15:49:16 -08:00
Craig Tiller c35e2c582f Revert "Proto API for LB request/responses" 2016-02-11 15:45:03 -08:00
Craig Tiller c3602dc1cf Merge pull request #4038 from dgquintas/grpclb_api
Proto API for LB request/responses
2016-02-11 15:32:22 -08:00
murgatroid99 ab604b6d76 Bundle node-pre-gyp with the node package 2016-02-11 12:59:37 -08:00
Craig Tiller b9a5f167d1 Merge pull request #5205 from grpc/release-0_13
Release 0.13 upmerge.
2016-02-11 10:55:20 -08:00
Alistair Veitch 749250f6a0 merge to HEAD 2016-02-11 09:23:20 -08:00
David Garcia Quintas 742a783c0d Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-11 01:04:28 -08:00
murgatroid99 8c686e7507 Stop explicitly supporting Node 0.10 and 0.11 2016-02-10 10:59:22 -08:00
Craig Tiller f73429901a Merge github.com:grpc/grpc into sceq 2016-02-09 16:32:51 -08:00
Craig Tiller 1298afd10e Get compilation working again 2016-02-09 12:29:17 -08:00
Craig Tiller da179ce598 Rollback gpr deletion 2016-02-09 12:01:53 -08:00
David Garcia Quintas 7e46618897 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-08 20:07:19 -08:00
Nicolas "Pixel" Noble 1935c3655c Flagging master as 0.14.0-dev. 2016-02-09 01:54:56 +01:00
murgatroid99 b0162c48bd Make Node's package.json use the version from build.yaml 2016-02-08 16:06:12 -08:00
Alistair Veitch ba6065f016 merge 2016-02-05 13:27:42 -08:00
Bogdan Drutu e4fdcd9242 Merge pull request #5013 from a-veitch/tag_set_to_context
Change all instances of census_tag_set to census_context
2016-02-04 12:42:35 -08:00
Alistair Veitch 6f2b8993fd merge 2016-02-03 09:02:46 -08:00
murgatroid99 91629977e8 Add new Node JS file to build.yaml 2016-02-03 08:46:45 -08:00
Alistair Veitch 85afe71d4c initial commit 2016-02-02 17:58:15 -08:00
Nicolas "Pixel" Noble 89d8ed1b91 Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable
Conflicts:
	BUILD
	Makefile
	binding.gyp
	build.yaml
	gRPC.podspec
	grpc.gemspec
	package.json
	src/python/grpcio/grpc_core_dependencies.py
	templates/Makefile.template
	tools/doxygen/Doxyfile.core.internal
	tools/run_tests/sources_and_headers.json
	vsprojects/vcxproj/gpr/gpr.vcxproj
	vsprojects/vcxproj/gpr/gpr.vcxproj.filters
2016-02-03 01:27:46 +01:00
Alistair Veitch 75d5c0f024 post merge 2016-02-02 09:43:02 -08:00
Craig Tiller 841c726140 Merge github.com:grpc/grpc into sceq 2016-02-02 09:23:22 -08:00
Craig Tiller 4bef7cebe6 Use old memcpy for wrappers 2016-02-02 08:38:43 -08:00
Craig Tiller f09fb7e4b0 Merge pull request #4979 from nicolasnoble/win32_subprocess
Adding windows support for gpr subprocesses.
2016-02-01 07:35:10 -08:00
Craig Tiller cbc4629c52 Merge pull request #4978 from nicolasnoble/alarming
Fixing, using and testing alarm code.
2016-01-31 18:11:03 -08:00
Nicolas "Pixel" Noble cf37cb9f9e Merge branch 'census-placeholders' into make-ruby-installable
Conflicts:
	package.json
	tools/doxygen/Doxyfile.core.internal
2016-01-31 09:34:46 +01:00
Nicolas "Pixel" Noble fa132c2f56 Actually moving this to the proper place. 2016-01-31 09:31:15 +01:00
Nicolas "Pixel" Noble 78825caeeb Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts:
	BUILD
	Makefile
	binding.gyp
	build.yaml
	gRPC.podspec
	grpc.gemspec
	src/python/grpcio/grpc_core_dependencies.py
	tools/run_tests/sources_and_headers.json
	vsprojects/vcxproj/gpr/gpr.vcxproj
	vsprojects/vcxproj/gpr/gpr.vcxproj.filters
2016-01-31 07:08:20 +01:00
Nicolas "Pixel" Noble 4fba286e4d Adding windows support for gpr subprocesses. 2016-01-31 07:00:53 +01:00
Nicolas "Pixel" Noble bf192eff56 Merge branch 'alarming' into make-ruby-installable
Conflicts:
	tools/run_tests/sources_and_headers.json
2016-01-31 06:25:39 +01:00
Nicolas "Pixel" Noble d5d83aa33f Fixing, using and testing alarm code. 2016-01-31 06:21:49 +01:00
Nicolas "Pixel" Noble 09121799b0 Removing gpr as a separated library. 2016-01-30 09:34:22 +01:00
David Garcia Quintas dd18c4a4a3 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-29 15:05:53 -08:00
David Garcia Quintas fb01883859 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-28 14:39:54 -08:00
Craig Tiller 8c50db09b9 Merge github.com:grpc/grpc into sceq 2016-01-28 11:38:21 -08:00
David Garcia Quintas b4e51b52bd Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces 2016-01-27 19:57:58 -08:00
murgatroid99 240eab7e66 Merge branch 'master' into node_binary_precompile 2016-01-26 17:19:04 -08:00
David Garcia Quintas b523c732d1 async_stream.h done. Compiles 2016-01-25 18:22:28 -08:00
David Garcia Quintas 2425bbbc55 Further work. Compiles. WIP 2016-01-25 17:32:48 -08:00
murgatroid99 5c56c92bec Make Node library depend on BoringSSL and zlib, and only build them under Windows 2016-01-25 13:32:52 -08:00
David Garcia Quintas 541db25d45 Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces 2016-01-25 12:53:50 -08:00
Craig Tiller 194824467c Get subchannel index working 2016-01-25 09:59:20 -08:00
Craig Tiller f968a87e3f Fix build 2016-01-22 16:07:42 -08:00
David Garcia Quintas ddcb53a9de made codegen targets in build.yaml 2016-01-21 17:48:34 -08:00
David Garcia Quintas 898588ba33 added missing codegen deps for grp 2016-01-21 11:14:49 -08:00
David Garcia Quintas 08a0a3306e Made "codedgen" directories closed over #includes 2016-01-21 01:04:36 -08:00
murgatroid99 a3508e3bcf Make sure that the binary URL includes the word Node 2016-01-20 13:58:24 -08:00
murgatroid99 e190f35e66 Completed integration of node-pre-gyp into Node library 2016-01-20 13:52:08 -08:00
murgatroid99 f1e9552ccf Updated node-pre-gyp to use Google Cloud Storage 2016-01-19 10:42:06 -08:00
murgatroid99 31de1450a6 Change node-pre-gyp install command line 2016-01-15 16:12:26 -08:00
murgatroid99 7905a72eac Added node-pre-gyp stuff to package.json 2016-01-15 15:28:22 -08:00
David Garcia Quintas 8a5d195e4a re-gend projects 2016-01-15 14:20:09 -08:00
murgatroid99 8b791a4a7f Merged from master and resolved merge conflicts 2016-01-08 12:33:22 -08:00
Craig Tiller b698eda17f Merge pull request #4610 from murgatroid99/node_dependencies_version_update
Update some Node dependencies to more recent versions
2016-01-07 16:55:46 -08:00
murgatroid99 5e7a9fef0f Slightly loosen dependencies 2016-01-07 13:33:39 -08:00
murgatroid99 c3910cadb4 Expose core metadata validation functions in public headers 2016-01-06 13:14:23 -08:00
murgatroid99 17e781a928 Updated some Node dependencies to more recent versions 2016-01-04 15:24:53 -08:00
murgatroid99 0bb6fcfb5a Generate the Node package.json from build.yaml 2015-12-21 16:11:27 -08:00
Jan Tattermusch f3e92c43b9 Merge pull request #4321 from murgatroid99/node_benchmark_service
Node benchmark service
2015-12-08 11:02:18 -08:00
murgatroid99 fb40b81cda Added most of what's needed for QPS benchmark measurement 2015-11-24 17:21:40 -08:00
murgatroid99 f37a90c0d9 Updated Node package version to 0.12.0 2015-11-19 13:38:35 -08:00
murgatroid99 a653e0fe7e Added per-test XML reports for Node tests on Jenkins 2015-10-22 14:25:56 -07:00
murgatroid99 6d6009fec5 Distribute roots.pem with the Node package 2015-10-15 09:57:31 -07:00
murgatroid99 fd994f11b8 Consolidated gyp files to fix Node installation issue 2015-10-09 14:02:28 -07:00
murgatroid99 8d5396aac1 Resolved merge conflicts 2015-10-07 12:37:58 -07:00
murgatroid99 2af89e49cb Moved gRPC node package root to repo root, made it depend on grpc.gyp 2015-10-01 11:54:00 -07:00