Commit Graph

807 Commits

Author SHA1 Message Date
Alistair Veitch 9ded5dbf35 fix missed merge issue 2016-02-03 11:24:11 -08:00
Alistair Veitch 46b9d5b408 fix broken merge of build.yaml 2016-02-03 09:06:48 -08:00
Alistair Veitch 6f2b8993fd merge 2016-02-03 09:02:46 -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 ddb163a0e4 merge 2016-02-02 13:33:44 -08:00
Nicolas Noble 9e9e2f721f Merge pull request #5007 from ctiller/memcpy3
Use old memcpy for wrappers
2016-02-02 13:29:51 -08:00
Nicolas "Pixel" Noble 8696d577d6 Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable 2016-02-02 20:14:56 +01:00
Alistair Veitch 75d5c0f024 post merge 2016-02-02 09:43:02 -08:00
Craig Tiller 4bef7cebe6 Use old memcpy for wrappers 2016-02-02 08:38:43 -08:00
Vijay Pai 03ba4d746a Merge branch 'master' into corelimit2 2016-02-01 08:17:27 -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 d2f20efcd8 Regenerating files. 2016-01-31 07:52:59 +01:00
Nicolas "Pixel" Noble 1ed8588d4d Merge branch 'alarming' into make-ruby-installable 2016-01-31 07:36:03 +01:00
Nicolas "Pixel" Noble c6473ec9f6 Adding missing project files. 2016-01-31 07:35:39 +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 d79ef3af71 Fixed wrong usage of global var 2016-01-28 00:21:27 -08:00
David Garcia Quintas 6bd7b97dc6 DONE!!1one 2016-01-27 19:21:12 -08:00
David Garcia Quintas e1300deb87 After GrpcLibrary refactoring. Compiles and passes. WIP still 2016-01-27 18:41:26 -08:00
David Garcia Quintas 6a48405ed0 pre sync_stream.cc creation. Does not compile 2016-01-25 19:12:37 -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
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 f968a87e3f Fix build 2016-01-22 16:07:42 -08:00
Bogdan Drutu fc65bf07e6 Merge pull request #4750 from a-veitch/tag_set
Census Tag Set API and implementation
2016-01-22 15:34:34 -08:00
Jan Tattermusch dadf6ba897 Merge pull request #4812 from ctiller/integrate-zlib
Make zlib a first class build citizen
2016-01-22 14:02:34 -08:00
Michael Lumish 292a8afd11 Merge pull request #4820 from jtattermusch/new_csharp_nuget
Revamp C# Nuget package
2016-01-22 13:07:06 -08:00
David Garcia Quintas 347d58bb9a Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces 2016-01-21 18:06:51 -08:00
David Garcia Quintas ddcb53a9de made codegen targets in build.yaml 2016-01-21 17:48:34 -08:00
Jan Tattermusch f087ec0f4c revamp native package building 2016-01-21 14:49:25 -08:00
David Garcia Quintas edc87ecad1 more dependency/sanity fixes 2016-01-21 13:30:13 -08:00
Craig Tiller f813f57ec5 Clean up Windows 2016-01-21 13:20:29 -08:00
Craig Tiller 3dca23aa0d Make zlib a first class build citizen 2016-01-21 11:44:55 -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
Jan Tattermusch 7c60b276de Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes 2016-01-20 18:23:13 -08:00
David Garcia Quintas a396276cde regenerated projects 2016-01-20 14:27:56 -08:00
David Garcia Quintas 167221423b Regenerated projects 2016-01-20 11:11:55 -08:00
vjpai c803442204 Rename coresched --> limit_cores 2016-01-19 15:32:42 -08:00
yang-g 1ac3093450 re-generate projects 2016-01-19 09:48:09 -08:00
vjpai f6269a4dca Merge branch 'master' into corelimit2 2016-01-19 08:01:47 -08:00
Alistair Veitch 0923126cf8 Merge branch 'master' into tag_set 2016-01-15 17:57:56 -08:00
yang-g 512c4f7447 Merge remote-tracking branch 'upstream/master' into sync_async_mix 2016-01-15 14:09:24 -08:00
Nicolas Noble 166e749de8 Merge pull request #4696 from jtattermusch/win_static_deps
Link grpc_csharp_ext dependencies on Windows statically
2016-01-15 14:04:18 -08:00