Commit Graph

57 Commits

Author SHA1 Message Date
David Garcia Quintas f01ccb7ba3 Merge branch 'master' of github.com:grpc/grpc into qps_reporter_refactoring 2015-05-22 10:39:02 -07:00
David Garcia Quintas 1d780fd3df Fixed typo 2015-05-22 10:37:27 -07:00
David Garcia Quintas 30ecd2b8d9 Return shared_ptr by value plus minor dependency fix 2015-05-20 23:08:29 -07:00
David Garcia Quintas a6b559a76a Improvements to reporting mechanism based on comments.
Turned the reporter into a composite, much cleaner arch.
2015-05-20 23:08:29 -07:00
David Garcia Quintas 226beffea1 Simplified code based on comments and fixed build.json 2015-05-20 23:08:29 -07:00
David Garcia Quintas 87ca82768d Added missing benchmark_config.* files 2015-05-20 23:08:29 -07:00
Craig Tiller 4f8b679a49 Merge github.com:grpc/grpc into mmm-mmm-mmm-mmm
Conflicts:
	Makefile
	build.json
2015-05-19 09:13:35 -07:00
Yang Gao b57f72dbee resolve comments 2015-05-17 21:54:54 -07:00
Yang Gao 26a4912558 Add fake credentials to the test and verify it actually works 2015-05-15 17:02:56 -07:00
Craig Tiller 3cdd9bbdbc clang-format 2015-05-15 14:43:47 -07:00
Craig Tiller fbac5f17b7 Crash handling test 2015-05-15 14:20:44 -07:00
Yang Gao a89389283f support per call credentials in c++ 2015-05-14 11:51:07 -07:00
Nicolas "Pixel" Noble fd2bf675f7 Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
	include/grpc++/completion_queue.h
2015-04-24 23:24:44 +02:00
Yang Gao c4b6ffb1b6 Add a GrpcLibrary class to wrap grpc_init and grpc_shutdown and convert all the tests to init/shutdown free. 2015-04-24 13:09:40 -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
Nicolas "Pixel" Noble 0caebbfcfe Splitting gRPC service class codegen into its own set of files. 2015-04-09 23:08:51 +02:00
Nicolas "Pixel" Noble a05b8b7b25 Removing a few more references to #include <chrono> 2015-04-08 09:07:20 +02:00
Nicolas Noble 89219162dd Refactoring std::chrono out. 2015-04-08 05:42:08 +02:00
Yang Gao 0c4b0ddcc5 Add tests with delayed cancellation from client and server 2015-03-30 13:08:34 -07:00
Yang Gao b946b5ea74 Refactor and add a unit test 2015-03-27 13:20:59 -07:00
Yang Gao 48bbd000eb merge upstream and resolve conflict 2015-03-26 23:12:14 -07:00
Yang Gao 166f9d00ce add back mis-deleted method string 2015-03-26 23:06:45 -07:00
Yang Gao ced2b89f55 Finish grpc_cli 2015-03-26 22:59:54 -07:00
Yang Gao a5e20d35c9 a stub of the cli tool 2015-03-25 09:55:20 -07:00
Yang Gao cdb2a6e071 Protect on some overflow scenarios, add a test and build/run the test 2015-03-20 23:55:04 -07:00
Yang Gao 6baa9b67ad clang-format c++ code 2015-03-17 10:49:39 -07:00
Craig Tiller 61691f92c3 Merge github.com:grpc/grpc into credit 2015-03-02 08:51:52 -08:00
Nicolas "Pixel" Noble 1ff52d5278 Guard headers tool. 2015-03-01 06:18:14 +01:00
Craig Tiller 29f1314282 Merge github.com:grpc/grpc into credit 2015-02-26 11:23:01 -08:00
Craig Tiller 36ccead403 Merge pull request #735 from jboeuf/fix_ssl_san
Verifying the peer name on the X509 Certs correctly.
2015-02-24 21:11:26 -08:00
Craig Tiller b9d91eb454 Merge github.com:google/grpc into deprecate-c++
Conflicts:
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
2015-02-23 17:13:40 -08:00
Julien Boeuf 597a4f2273 Verifying the peer name on the X509 Certs correctly.
- The SANs take precedence over the CN.
- The CN is only checked if there are no SANs.
- Fixing the tests as the test cert did not list *.test.google.com in
  the SANs. Will fix the test cert another time...
2015-02-23 16:41:26 -08:00
Craig Tiller e8eb8a4fd4 Merge github.com:grpc/grpc into credit 2015-02-23 14:56:42 -08:00
Craig Tiller e4fe844b67 s/CreateChannel/CreateChannelDeprecated
For the 2-argument version of CreateChannel.

This is a temporary step until #711 is ready to roll out.
2015-02-23 13:55:15 -08:00
Julien Boeuf c66f2a816e Addressing iniitial feedback.
- Renaming default credentials -> google default credentials.
- Various other things in cpp:
  - Adding Cpp wrapping for JWT Tokens.
  - Renaming ComposeCredentials -> CompositeCredentials.
2015-02-23 13:00:36 -08:00
Craig Tiller 47c83fdaf7 Credentials prototyping
- Remove CredentialsFactory as it's unnecessary
- Effectively make Credentials a channel factory, allowing different credential types to create different channel types - this gives us a hook so that InsecureCredentials can at runtime instantiate a different kind of channel as required - giving us a way of generating an openssl free version of grpc++.
- Server credentials not touched yet, but they'll need to be updated.
2015-02-23 09:58:22 -08:00
Craig Tiller ce5021b0b9 Add missing new-lines at end of file 2015-02-18 09:25:21 -08:00
Craig Tiller 190d360def Add missing new-lines at end of file 2015-02-18 09:23:38 -08:00
Craig Tiller 0605995e55 Update copyright to 2015 2015-02-18 08:34:56 -08:00
Craig Tiller ad1fd3a49e Add proto copyrights 2015-02-16 12:23:04 -08:00
Yang Gao 48d80e5769 update comments 2015-02-05 23:11:02 -08:00
Yang Gao 1988221d15 Use environment variable to set root certs in c++ interop test. 2015-02-05 23:06:54 -08:00
Yang Gao eec8d1a56c fix comments 2015-01-26 11:03:21 -08:00
Yang Gao 5fd0d29dfe run clang-format 2015-01-26 00:19:48 -08:00
Yang Gao 02ce729ce2 make CreateTestChannel support additional credentials besides ssl 2015-01-25 23:12:43 -08:00
Julien Boeuf 8fbcc4391e Changing the SSL (Server) Credentials API.
- Changed the unsigned char * + size to NULL terminated strings which
  makes sense for the PEM format. I may change TSI later (but the impact
  will hopefully be much more limited).
- Added a way to pass multiple key/cert pairs to servers which is needed
  when hosting more than one domain.
- Removed the C++ SSL credentials tests as we are going to have an
  option to not specify the roots which will then be derived from the
  environment (well-known platform dependent locations and/or
  environment variable).
- Fixed the php build which is the only one added in the run_test.py.
  This change will certainly break node, python and ruby.
2015-01-20 22:18:15 -08:00
Craig Tiller b5dcec5a2e clang-format codebase 2015-01-13 11:13:42 -08:00
yangg 1456d15221 Add a test to export two TestService on the same server, only with different
package names. Make sure they work as intended.

This is based on []
	Change on 2015/01/08 by yangg <yangg@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=83558743
2015-01-09 17:54:03 -08:00