Nicolas "Pixel" Noble 8302b123de Merge branch 'v1.0.x' into manual-upmerge ... Conflicts: src/ruby/pb/test/client.rb src/ruby/pb/test/server.rb tools/dockerfile/test/php7_jessie_x64/Dockerfile		2016-07-29 22:48:16 +02:00
..
async_end2end_test.cc	Revert unnecessary deletions	2016-07-19 11:53:37 -07:00
client_crash_test.cc	Fix client_crash_test, implement idempotency, fail_fast for C++	2016-04-01 12:24:18 -07:00
client_crash_test_server.cc	Update copyrights	2016-03-31 07:46:18 -07:00
end2end_test.cc	Merge pull request #6737 from ctiller/delayed-write	2016-07-19 09:25:49 -07:00
generic_end2end_test.cc	Make grpc++ independent of protobuf	2016-06-03 15:21:15 -07:00
hybrid_end2end_test.cc	clang-format	2016-06-15 22:21:48 -07:00
mock_test.cc	Update copyrights	2016-03-31 07:46:18 -07:00
proto_server_reflection_test.cc	Separate generated file and protobuf dependency	2016-07-18 13:07:42 -07:00
server_builder_plugin_test.cc	Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread.	2016-07-14 00:42:07 +02:00
server_crash_test.cc	Update copyrights	2016-03-31 07:46:18 -07:00
server_crash_test_client.cc	Fixes	2016-04-01 13:01:26 -07:00
shutdown_test.cc	Expunge all references to zookeeper	2016-07-01 12:45:19 -07:00
streaming_throughput_test.cc	Update copyrights	2016-03-31 07:46:18 -07:00
test_service_impl.cc	Deal with to_string, proper usage of nullptr, and lack of map::emplace	2016-06-15 12:56:38 -07:00
test_service_impl.h	Add a test for server returning error with debug info in trailer.	2016-05-05 23:35:20 -07:00
thread_stress_test.cc	clang-format changes	2016-06-17 00:31:23 -07:00