Commit Graph

5 Commits

Author SHA1 Message Date
Yang Gao a89389283f support per call credentials in c++ 2015-05-14 11:51:07 -07:00
Nicolas "Pixel" Noble 23be280366 Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
	src/cpp/client/channel.cc
	vsprojects/vs2010/grpc++.vcxproj
	vsprojects/vs2013/grpc++.vcxproj.filters
2015-04-24 00:38:19 +02:00
Yang Gao 103837ee6b Wrap ParseCommandLineFlags in InitTest 2015-04-15 15:23:54 -07:00
Nicolas "Pixel" Noble b7c2035e83 Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2
Conflicts:
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
	test/cpp/interop/client.cc
2015-04-11 01:53:09 +02:00
Yang Gao a40020788f Split interop client and server into components 2015-04-09 23:25:21 -07:00