Commit Graph

194 Commits

Author SHA1 Message Date
Craig Tiller f73429901a Merge github.com:grpc/grpc into sceq 2016-02-09 16:32:51 -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 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
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 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
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
Craig Tiller b22aeae462 Merge github.com:grpc/grpc into sceq 2016-01-15 21:13:52 -08:00
Craig Tiller 694cf8b0d2 Shared subchannel sketch 2016-01-15 21:13:25 -08:00
Alistair Veitch 0923126cf8 Merge branch 'master' into tag_set 2016-01-15 17:57:56 -08:00
Alistair Veitch 0f690721bd Move encode/decode API into census.h 2016-01-13 09:08:38 -08:00
Alistair Veitch bb30d2591f initial commit 2016-01-12 17:36:05 -08:00
murgatroid99 8b791a4a7f Merged from master and resolved merge conflicts 2016-01-08 12:33:22 -08:00
murgatroid99 c3910cadb4 Expose core metadata validation functions in public headers 2016-01-06 13:14:23 -08:00
Craig Tiller 0fe5ee7be3 BoringSSL integration: non-vsprojects changes 2015-12-22 12:50:36 -08:00
Craig Tiller d5bd3b6abe Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-10 07:19:54 -08:00
Craig Tiller 95eeed7590 Kill noop_filter.c 2015-12-09 09:45:59 -08:00
Craig Tiller bbb73b66fb Nuke unused files 2015-12-09 06:58:28 -08:00
Craig Tiller 6c1aa8add6 Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-08 08:15:24 -08:00
Craig Tiller 26dab31f6e Start of ping sketch 2015-12-07 14:43:47 -08:00
Jorge Canizales 944c0743cc Merge release-0.12 into master 2015-12-07 11:01:39 -08:00
Sree Kuchibhotla 6fce197b3f Merge pull request #4188 from ctiller/no-transport-metadata
Remove metadata contexts
2015-12-02 09:23:14 -08:00
Jorge Canizales 0d718cd0f4 Point gRPC.podspec to pushed BoringSSL version
(1.0)
2015-12-01 18:01:01 -08:00
Jorge Canizales 2285186216 Point spec to BoringSSL 2015-12-01 17:56:48 -08:00
Nicolas "Pixel" Noble f9c58f3bf7 Merge branch 'release-0_12'
Conflicts:
	src/core/security/credentials.c
	test/core/security/credentials_test.c
2015-12-01 22:40:44 +01:00
Jorge Canizales e3d9db2667 Adjust version requirements through samples and tests. 2015-11-25 22:16:38 -08:00
Jorge Canizales d1908b10dd Move podspec version to 0.12 2015-11-25 18:19:37 -08:00
Craig Tiller de83121308 Merge github.com:grpc/grpc into no-transport-metadata 2015-11-25 15:32:59 -08:00
yang-g d9f6101967 merge with head 2015-11-24 10:39:23 -08:00
Craig Tiller fba79f213f AVL: creation, destroy, add 2015-11-23 11:06:55 -08:00
Craig Tiller ebdef9d674 Remove metadata context from the channel stack 2015-11-19 17:09:49 -08:00
Craig Tiller 2e7687c5ef Static metadata declarations 2015-11-18 14:56:46 -08:00
yang-g 71b962634e merge with head 2015-11-18 11:41:30 -08:00