Commit Graph

13 Commits

Author SHA1 Message Date
Craig Tiller fe8592ee99 Merge github.com:grpc/grpc into are-includes-sane
Conflicts:
	tools/doxygen/Doxyfile.c++.internal
2015-06-25 07:00:18 -07:00
Craig Tiller f75fc12e3a Add a test that headers are properly in build.json
Clean up anything that failed
2015-06-25 06:58:00 -07:00
Craig Tiller eb327fba7c Make it less likely a build.json change triggers a merge conflict 2015-06-23 16:51:38 -07:00
yang-g adfed03146 Add missing headers to build.json 2015-06-23 13:01:22 -07:00
Craig Tiller 6ef7f31b98 Add missing file to build.json 2015-06-05 10:15:10 -07:00
Craig Tiller ba08ba221e Merge branch 'there-is-a-place-for-everything-and-the-old-place-was-wrong' into one-shouldnt-depend-on-protobufs 2015-06-05 10:08:26 -07:00
Craig Tiller 78a97ed3f9 Get internal documentation generated in the right place 2015-06-05 10:03:53 -07:00
Craig Tiller 50a7a68ca2 Progress commit on fixing up C++ 2015-06-04 12:53:40 -07:00
Craig Tiller 409263c59f Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
	tools/doxygen/Doxyfile.core.internal
2015-06-04 08:44:53 -07:00
Yang Gao 6f4fb3b133 Add ability to override default thread pool 2015-06-03 12:56:19 -07:00
Craig Tiller f29a6c107d Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup
Conflicts:
	Makefile
	build.json
	src/core/security/credentials.c
	src/core/security/credentials.h
	src/core/surface/call.c
	test/core/end2end/tests/request_response_with_payload_and_call_creds.c
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.core
2015-05-30 11:11:05 -07:00
Nicolas "Pixel" Noble 2ae2982324 Tagging 0.9.1 on master. 2015-05-30 00:36:14 +02:00
Craig Tiller 6c4ae607fe Add doxygen setups for internal documentation 2015-05-29 15:00:50 -07:00