Commit Graph

230 Commits

Author SHA1 Message Date
Craig Tiller 36bf4d55e1 Merge github.com:grpc/grpc into backoff_lib 2016-03-17 07:43:22 -07:00
Nicolas "Pixel" Noble e8fb852a73 Massaging that pull request. 2016-03-17 00:31:43 +01:00
Craig Tiller c72cc42238 Build out backoff as a library 2016-03-11 10:54:36 -08:00
David Garcia Quintas a9d0629677 Merge branch 'codegen_proto_utils_fix' into codegen_lib 2016-03-06 19:10:15 -08:00
Craig Tiller 4ea4599a50 Merge github.com:grpc/grpc into naming-crisis 2016-02-23 17:13:38 -08:00
Craig Tiller 70ab4c5cef Merge github.com:grpc/grpc into fix-proto-docker 2016-02-22 22:29:51 -08:00
Craig Tiller c866f7281f Merge github.com:grpc/grpc into naming-crisis 2016-02-22 22:23:43 -08:00
Craig Tiller 521423c8cf Regenerate files, fix bugs 2016-02-22 22:22:22 -08:00
Vijay Pai 349bba9179 Merge pull request #5257 from ctiller/cleaner-posix
Separate timer checking from pollsets
2016-02-22 16:30:18 -08:00
Alistair Veitch 7771544111 rename census log files to avoid build breakage on MacOS 2016-02-22 14:20:25 -08:00
Masood Malekghassemi 9f79159590 Merge pull request #5302 from nicolasnoble/python-windows
Enabling python artifact building for Windows.
2016-02-22 11:37:22 -08:00
Nicolas "Pixel" Noble 2e8fdbac77 Building the dlls. 2016-02-19 05:39:15 +01:00
David Garcia Quintas 2173eea18b Merge branch 'master' of github.com:grpc/grpc into codegen_lib 2016-02-18 15:13:54 -08:00
David Garcia Quintas a8bb0bfc3e Split codegen target and made it libs 2016-02-18 15:09:02 -08:00
Craig Tiller 9dc184fd95 Merge github.com:grpc/grpc into cleaner-posix 2016-02-18 07:21:17 -08:00
Craig Tiller 16f6826ffd Merge github.com:grpc/grpc into fix-proto-docker 2016-02-18 07:14:37 -08:00
Craig Tiller c0ce00fd16 Merge github.com:grpc/grpc into sceq 2016-02-17 14:25:12 -08:00
Craig Tiller ccdea1900f Separate timer checking from pollsets 2016-02-16 08:06:46 -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
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
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
Alistair Veitch ba6065f016 merge 2016-02-05 13:27:42 -08:00
Alistair Veitch 6f2b8993fd merge 2016-02-03 09:02:46 -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
Michael Lumish 5441c222e3 Merge pull request #4959 from grpc/release-0_12
Release 0.12 -> master
2016-01-29 09:26:42 -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
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
Jorge Canizales 83f746b4da Upgrade BoringSSL podspec to v2.0 2016-01-25 15:47:26 -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 d8e6f8d4f5 Merge github.com:grpc/grpc into sceq 2016-01-22 19:24:23 -08:00