Commit Graph

655 Commits

Author SHA1 Message Date
Craig Tiller 377881204f Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name 2015-07-06 10:26:03 -07:00
Vijay Pai 775eaec770 Merge pull request #2151 from sidrakesh93/master
Changes required for reporting metrics to performance database server
2015-07-06 10:13:59 -07:00
Craig Tiller 248a5a024c Merge github.com:grpc/grpc into tis-but-thy-name 2015-07-01 15:04:31 -07:00
Nicolas Noble 1aa4bc0853 Merge pull request #2268 from murgatroid99/makefile_pkg-config_generate
Add .pc file generation to Makefile
2015-07-01 14:40:46 -07:00
murgatroid99 dbc0caf30e Fixed gpr name in .pc file 2015-07-01 12:59:49 -07:00
murgatroid99 c34a3a6e60 Added missing pthread gpr requirement 2015-07-01 10:35:33 -07:00
Craig Tiller d6cc19e6d7 Tweak timeouts for ?SAN 2015-07-01 10:05:00 -07:00
Siddharth Rakesh f8857de339 Merge branch 'master' of https://github.com/grpc/grpc 2015-06-30 20:26:58 -07:00
murgatroid99 395c3ed1c4 Regenerate Makefile 2015-06-30 17:57:24 -07:00
murgatroid99 8faab237e5 Add .pc file generation to Makefile 2015-06-30 17:24:21 -07:00
Craig Tiller 49dc1146ec Merge github.com:grpc/grpc into forever-is-a-long-time 2015-06-30 16:38:39 -07:00
Siddharth Rakesh a6d13f35b8 Merge branch 'master' of https://github.com/grpc/grpc 2015-06-30 16:36:35 -07:00
Craig Tiller d32d1377c3 Merge github.com:grpc/grpc into tis-but-thy-name 2015-06-30 09:47:42 -07:00
murgatroid99 da7a994a4d Fixed some linking problems 2015-06-29 14:57:37 -07:00
Siddharth Rakesh 25481f72c1 Resolving merge conflict 2015-06-29 13:27:23 -07:00
Siddharth Rakesh 872e8187c2 Adding required changes 2015-06-29 13:06:25 -07:00
murgatroid99 24e2f4ad84 Added pkg-config checking to Makefile where possible 2015-06-29 11:12:01 -07:00
Craig Tiller 08a1cf8f4f Use connectivity state tracking code in chttp2 transport 2015-06-29 09:37:52 -07:00
Craig Tiller 4d74056b08 Merge branch 'forever-is-a-long-time' into tis-but-thy-name
Conflicts:
	Makefile
	vsprojects/Grpc.mak
2015-06-29 08:49:49 -07:00
Craig Tiller ee98d84a02 Add an fd conservation test to verify that fds actually close 2015-06-29 08:45:55 -07:00
Craig Tiller acf0f07dfc Unix resolver, bug fixes 2015-06-29 08:24:16 -07:00
Craig Tiller c7b5f7605e Factor out channel state watching 2015-06-27 11:48:42 -07:00
Craig Tiller 0c5cf25d4e Merge github.com:grpc/grpc into tis-but-thy-name 2015-06-26 14:42:54 -07:00
Vijay Pai 8bcba9a08f Merge pull request #2149 from ctiller/oops-i-split-it-again
Initial transport lock split up
2015-06-26 13:58:55 -07:00
Craig Tiller ef2a3e22a1 Merge github.com:grpc/grpc into forever-is-a-long-time 2015-06-26 10:48:17 -07:00
Craig Tiller 052d27b891 Tidy up test to meet our standards 2015-06-26 08:11:34 -07:00
Craig Tiller 30ee10b785 Rename test into the right place 2015-06-26 08:09:01 -07:00
Masood Malekghassemi 1aa041ab1a BLARGHAFLARGHAAHAJHAKJHATJHKAYMNHZIYRN 2015-06-25 18:02:18 -07:00
Craig Tiller 916246625b Introduce connector, to help subchannel connect 2015-06-25 16:31:02 -07:00
Craig Tiller e039f03383 Plumbing transport_op changes through 2015-06-25 12:54:23 -07:00
Craig Tiller 3b1847c528 Merge branch 'oops-i-split-it-again' into tis-but-thy-name 2015-06-25 09:00:34 -07:00
Craig Tiller 4b62811032 Merge github.com:grpc/grpc into tis-but-thy-name 2015-06-25 08:58:23 -07:00
Craig Tiller 6e8c7e87ef Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-25 08:52:40 -07:00
Craig Tiller f5f1712e1f Refactoring progress towards integrating client configs 2015-06-25 08:47:26 -07:00
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 3bc8ebd48e Implementation work for client_config
- uri parsing
- dns resolution
2015-06-24 15:41:15 -07:00
Siddharth Rakesh 66ebce4a61 Merge branch 'master' of https://github.com/grpc/grpc 2015-06-24 14:42:34 -07:00
Craig Tiller 7df28a7bd2 Merge github.com:grpc/grpc into that-which-we-call-a-rose
Introduce resolver_factory
2015-06-24 09:23:52 -07:00
Craig Tiller d13794332c Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-24 08:48:14 -07:00
Siddharth Rakesh d9207715c5 Merge branch 'master' of https://github.com/grpc/grpc 2015-06-23 16:34:42 -07:00
Craig Tiller 009886cf79 Merge github.com:grpc/grpc into that-which-we-call-a-rose
Conflicts:
	gRPC.podspec
	tools/doxygen/Doxyfile.core.internal
2015-06-23 16:26:18 -07:00
Craig Tiller af69180478 Flesh out things and make them compile 2015-06-23 14:57:07 -07:00
Craig Tiller 31489e3aba Move some code out of src/ into tools/
It shouldn't count towards coverage
2015-06-23 14:27:34 -07:00
yang-g adfed03146 Add missing headers to build.json 2015-06-23 13:01:22 -07:00
Siddharth Rakesh 500007ab68 Merge branch 'master' of https://github.com/grpc/grpc 2015-06-23 11:22:46 -07:00
Yang Gao 253aaa6b10 Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs
Remove Protobuf dependency for C++
2015-06-23 10:05:20 -07:00
Craig Tiller 949b6ee796 Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-23 09:26:21 -07:00
Craig Tiller aa555df7ee Merge pull request #2175 from yang-g/constness
Add const to ByteBuffer methods and add tests
2015-06-23 07:54:19 -07:00
Yang Gao 89c5a56233 Add const to ByteBuffer methods and add tests 2015-06-22 16:31:11 -07:00