Commit Graph

864 Commits

Author SHA1 Message Date
murgatroid99 be51c29e1c Merge branch 'master' into uv_core_transport 2016-09-23 14:35:49 -07:00
murgatroid99 bc2693ee52 Fix mismatched new[] and delete in Node extension code 2016-09-20 09:55:33 -07:00
murgatroid99 e6d7d78bc8 Merge branch 'master' into uv_core_transport 2016-09-16 13:44:28 -07:00
murgatroid99 4159622a60 Add a libuv endpoint to the C core, for use in the Node library 2016-09-16 13:25:08 -07:00
Philipp Wahala dc9eded992 Fix typo in node.js README 2016-09-07 20:22:51 +02:00
Nicolas "Pixel" Noble 83f5f393b6 Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Nicolas "Pixel" Noble 6a7a801d5b Bumping version to 1.0.1-pre1. 2016-08-18 21:57:20 +02:00
Nicolas "Pixel" Noble 96f0b5ff59 Removing pre2 flag. 2016-08-16 03:07:09 +02:00
Nicolas "Pixel" Noble b4828c3762 Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge 2016-08-16 01:54:33 +02:00
murgatroid99 5ebba7b69a Update Node library dependencies and change deprecated function calls 2016-08-15 13:14:16 -07:00
Nicolas Noble 5f3d234698 Merge pull request #7681 from murgatroid99/node_tools_integrate_plugin
Make Node grpc-tools protoc automatically call the plugin
2016-08-11 15:36:20 -07:00
Nicolas Noble 465db73eac Merge pull request #7577 from murgatroid99/node_dependency_update
Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0
2016-08-11 14:23:26 -07:00
Nicolas "Pixel" Noble 9474108971 Merge branch 'v1.0.x' into manual-upmerge 2016-08-11 21:00:08 +02:00
murgatroid99 bceacb5ed3 Make Node grpc-tools protoc automatically call the plugin 2016-08-09 11:35:19 -07:00
Nicolas "Pixel" Noble 2fc58ed286 Merge branch 'v1.0.x' of https://github.com/grpc/grpc
Conflicts:
	CMakeLists.txt
	Makefile
	build.yaml
	package.json
	src/core/lib/surface/version.c
	src/csharp/Grpc.Auth/project.json
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Core/project.json
	src/csharp/Grpc.HealthCheck/project.json
	src/csharp/build_packages.bat
	src/node/health_check/package.json
	src/node/tools/package.json
	src/python/grpcio/grpc_version.py
	src/python/grpcio_health_checking/grpc_version.py
	src/python/grpcio_tests/grpc_version.py
	src/ruby/lib/grpc/version.rb
	src/ruby/tools/version.rb
	tools/distrib/python/grpcio_tools/grpc_version.py
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal
2016-08-03 19:54:49 +02:00
murgatroid99 792ddf9ea8 Regenerate packages 2016-08-02 14:38:00 -07:00
murgatroid99 2732591d56 Merge remote-tracking branch 'upstream/v1.0.x' into node_dependency_update 2016-08-02 14:37:05 -07:00
murgatroid99 7ca38bd5b8 Fix error handling authentication errors with non-numeric error codes 2016-08-02 13:07:35 -07:00
David Garcia Quintas 68089fa8f9 Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 2016-08-01 11:02:22 -07:00
Nicolas "Pixel" Noble a6451e93ab Bumping to 1.0.0-pre2. 2016-07-29 22:56:12 +02:00
Nicolas "Pixel" Noble d45aa8c411 Merge branch 'v1.0.x' into manual-upmerge
Conflicts:
	src/ruby/pb/test/client.rb
	src/ruby/pb/test/server.rb
	tools/dockerfile/test/php7_jessie_x64/Dockerfile
2016-07-29 22:48:16 +02:00
murgatroid99 5812daa5e1 Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0 2016-07-29 10:44:01 -07:00
kpayson64 9326b8d9f7 Merge pull request #7394 from murgatroid99/node_client_creds_memory_leak
Fix a memory leak in Node call credentials
2016-07-25 14:24:42 -07:00
murgatroid99 8a0194d1da Fixed typo in Node health check package.json 2016-07-21 11:28:35 -07:00
David Garcia Quintas caead64200 Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 2016-07-14 14:13:41 -07:00
murgatroid99 5fcc18197b Fix a memory leak in Node call credentials 2016-07-14 13:22:22 -07:00
Nicolas "Pixel" Noble 3f165d34db Master is now 1.1.0-dev. 2016-07-12 09:31:41 +02:00
Nicolas "Pixel" Noble 90da4d218b Flagging master as 1.0.0-pre1. 2016-07-12 09:18:18 +02:00
Nicolas "Pixel" Noble 675c458894 Merge branch 'release-0_15' into upmerge-master
Conflicts:
	Makefile
	build.yaml
	gRPC-Core.podspec
	gRPC.podspec
	package.json
	package.xml
	src/core/lib/surface/version.c
	src/csharp/Grpc.Auth/project.json
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Core/project.json
	src/csharp/Grpc.HealthCheck/project.json
	src/csharp/build_packages.bat
	src/node/tools/package.json
	src/python/grpcio/grpc/__init__.py
	src/python/grpcio/grpc_version.py
	src/python/grpcio_tests/tests/unit/_rpc_test.py
	src/ruby/lib/grpc/version.rb
	src/ruby/tools/version.rb
	templates/gRPC.podspec.template
	tools/distrib/python/grpcio_tools/grpc_version.py
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal
	tools/run_tests/port_server.py
2016-07-12 04:30:57 +02:00
Nicolas Noble 25ddf0425e Merge pull request #7203 from murgatroid99/node_separate_health_check
Split Node health check code into a separate package and make it use static codegen
2016-07-08 13:34:12 -07:00
murgatroid99 9304adf4ae Add Node health check generated code and license files 2016-07-06 09:25:47 -07:00
Ken Payson b161c4a8c5 Updated release version to 0.15.1 2016-07-01 14:54:52 -07:00
murgatroid99 f8c6359d49 Add grpc module pointer file for Node health check tests 2016-07-01 13:17:04 -07:00
murgatroid99 6c4aef927a Add Node health check package.json 2016-07-01 10:02:32 -07:00
murgatroid99 965cd0c780 Split Node health check code into a separate package and make it use static codegen 2016-07-01 09:56:50 -07:00
David Garcia Quintas a05c874fea Return success status of grpc_byte_buffer_reader 2016-06-30 17:30:08 -07:00
murgatroid99 c3d28d42c2 Re-enable two Node credentials tests 2016-06-28 14:22:21 -07:00
Jan Tattermusch 6e42a808da Merge pull request #7046 from murgatroid99/master_merge_release-0_15
Merge release-0_15 into master
2016-06-27 11:49:46 -07:00
Craig Tiller 3fc3544e6c Merge pull request #6803 from sreecha/epoll_changes
New epoll based polling implementation
2016-06-25 08:43:50 -07:00
murgatroid99 e2c34f617e Merge release-0_15 into master 2016-06-24 13:24:03 -07:00
murgatroid99 6026a36566 Update version to 0.15.0 2016-06-24 11:12:03 -07:00
murgatroid99 c390be2ec4 Fix Node Windows build error 2016-06-24 11:06:28 -07:00
murgatroid99 23265da487 Update master branch to 0.16.0-dev 2016-06-24 10:26:14 -07:00
Jan Tattermusch a634de1c18 Merge pull request #6747 from murgatroid99/node_logger_customization
Allow Node users to set a custom logger and log verbosity.
2016-06-24 10:19:31 -07:00
Sree Kuchibhotla 3a086d555c generate_projects.sh 2016-06-24 09:27:00 -07:00
Sree Kuchibhotla 6ed5904a9d Merge branch 'master' into epoll_changes 2016-06-23 09:23:01 -07:00
David Garcia Quintas 21a9672c4f regenerated projects 2016-06-22 18:10:55 -07:00
Jan Tattermusch ee355a8f93 Merge pull request #6839 from dgquintas/simplify_compression_interop
Revamped interop spec, especially wrt compression
2016-06-21 20:28:15 -07:00
David Garcia Quintas 36e27d6874 updated node interop server 2016-06-21 16:43:31 -07:00
Sree Kuchibhotla 58a55c994f Merge branch 'master' into epoll_changes_merged 2016-06-21 16:31:35 -07:00