Commit Graph

738 Commits

Author SHA1 Message Date
Craig Tiller c5ae3eb8d6 Rename grpc_server_add_http2_port to grpc_server_add_insecure_http2_port 2015-08-03 10:42:22 -07:00
Michael Lumish 3d382a0da1 Merge pull request #2751 from ctiller/alphanumeric-juju-fish
Remove optional parameter from watch connectivity state
2015-08-03 08:41:05 -07:00
Yang Gao 7716c53a21 Merge pull request #2717 from ctiller/yeah-we-know-what-youre-talking-about
Make call_create with host=NULL provide a default host name
2015-07-31 21:34:38 -07:00
Craig Tiller 2cd9dd9da6 Remove optional parameter from watch connectivity state 2015-07-31 16:34:37 -07:00
Craig Tiller 86d1f1325d Merge github.com:grpc/grpc into insolent-pork-chop 2015-07-31 07:46:50 -07:00
Craig Tiller 44a127c80f Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
Conflicts:
	vsprojects/Grpc.mak
	vsprojects/grpc.sln
	vsprojects/grpc/grpc.vcxproj
	vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
	vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
	vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj
	vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj
	vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj
	vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj
	vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
2015-07-31 07:45:59 -07:00
Alistair Veitch 6796805897 Merge branch 'master' into issue_2709 2015-07-30 14:35:22 -07:00
Craig Tiller 42b6c93c36 Make TSAN happy with our lock free stack 2015-07-30 11:58:14 -07:00
Vijay Pai c226edcadc Merge pull request #2706 from yang-g/remove_get_from_accessor
make accessors from get_x() to x()
2015-07-30 11:44:28 -07:00
Yang Gao 7ee4b89d59 Merge pull request #2670 from a-veitch/server_context
Server side census context plumbing for c++
2015-07-30 10:04:21 -07:00
Alistair Veitch ff32faf3c9 Move grpc_census_call_*_context calls into public header 2015-07-30 09:54:15 -07:00
Craig Tiller 1aceadd92c Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
Conflicts:
	src/core/channel/http_client_filter.c
	src/core/surface/channel.c
2015-07-29 18:09:47 -07:00
Vijay Pai 339aaea50b Merge pull request #2711 from yang-g/missing_brace
fix build
2015-07-29 16:07:59 -07:00
yang-g 766d9ee148 fix build 2015-07-29 15:51:25 -07:00
Alistair Veitch 100a6e1d82 add struct include/grpc++/server_context.h src/cpp/server/server_context.cc 2015-07-29 15:25:28 -07:00
Vijay Pai 33b5bc2937 Merge pull request #2701 from nicolasnoble/fixing-windows-build
Fixing Windows build
2015-07-29 15:19:50 -07:00
yang-g 9a009f2a75 make accessors from get_x() to x() 2015-07-29 11:38:18 -07:00
Hongyu Chen 96f1e5a08e Merge pull request #2669 from a-veitch/init_api_fix
Enrich census initialization and feature code
2015-07-29 11:14:35 -07:00
Nicolas "Pixel" Noble b3d69c3c0f Fixing Windows build 2015-07-29 06:12:51 +02:00
Alistair Veitch a4c4d3c446 fix feature/function typo 2015-07-28 14:36:22 -07:00
Craig Tiller 753b3cbb5b Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other 2015-07-28 07:36:45 -07:00
Julien Boeuf eabb4f53b9 Addressing comments. 2015-07-27 16:28:09 -07:00
Julien Boeuf 4aee724004 Merge branch 'master' of github.com:grpc/grpc into ssl_force_client_auth 2015-07-27 16:16:29 -07:00
Alistair Veitch cf39e94872 Server side census context plumbing for c++ 2015-07-26 17:28:26 -07:00
Alistair Veitch 925e4a6349 Enrich census initialization and feature code 2015-07-26 16:51:23 -07:00
Craig Tiller d9aed1d010 Merge github.com:grpc/grpc into elliptic-orange-chamelion
Conflicts:
	src/csharp/ext/grpc_csharp_ext.c
2015-07-26 12:55:47 -07:00
Craig Tiller f0295cb885 Merge branch 'sometimes-its-good-just-to-check-in-with-each-other' into yeah-we-know-what-youre-talking-about 2015-07-26 12:53:48 -07:00
Craig Tiller 26b3714b72 Add a hook for sending default authority when needed 2015-07-26 12:53:27 -07:00
Craig Tiller dfc42da760 Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
	src/core/iomgr/tcp_server_windows.c
2015-07-26 12:37:53 -07:00
Yang Gao 2a31304d7f Merge pull request #2647 from vjpai/deepend
Dynamic-sized thread pool
2015-07-24 23:08:27 -07:00
Yang Gao e08cc80ea0 Merge pull request #2662 from vjpai/the_isolation_of_nullptr
Isolate nullptr to grpc namespace when we must define it ourselves
2015-07-24 21:49:07 -07:00
jboeuf 5749a3f467 Merge pull request #2605 from yang-g/fake_transport_security_to_private
Fake transport security to private
2015-07-24 21:30:35 -07:00
Vijay Pai d2a9b6da13 Isolate nullptr to grpc namespace when we must define it ourselves
Change the one non-namespace use of nullptr to NULL (used as an
argument to a C function anyway)
2015-07-25 00:56:33 +00:00
Vijay Pai f0c66c6365 Merge branch 'master' into deepend 2015-07-24 10:51:27 -07:00
yang-g 7cbac4cf95 Fix gpr_inf_future call 2015-07-23 23:00:52 -07:00
vjpai 02b80549e9 Bug fixes 2015-07-23 17:44:45 -07:00
vjpai b76f3ada11 Fix bug on shutdown case 2015-07-23 14:41:23 -07:00
vjpai b28456b1e4 Add dynamic thread pool and initial port of test 2015-07-23 14:17:10 -07:00
Yang Gao 2e7ce15635 Merge pull request #2617 from jboeuf/jwt_creds_renaming
Renaming jwt_credentials to service_account_jwt_access_credentials.
2015-07-23 13:29:01 -07:00
Craig Tiller 7cb0853755 Merge github.com:grpc/grpc into elliptic-orange-chamelion 2015-07-23 11:29:44 -07:00
Craig Tiller b256faa353 Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other 2015-07-23 11:28:16 -07:00
Craig Tiller 5126bb6d82 Merge pull request #2493 from a-veitch/record_stat
Census record stats API
2015-07-23 09:57:58 -07:00
Yang Gao b70440bb1d Merge pull request #2542 from ctiller/tell-me-who-you-might-be
Expose call peer uri from C core
2015-07-23 09:16:37 -07:00
Julien Boeuf fe4c3f4f14 Renaming jwt_credentials to service_account_jwt_access_credentials. 2015-07-22 16:20:13 -07:00
Craig Tiller 044d153141 Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
	src/core/client_config/subchannel.c
	src/core/iomgr/alarm.c
	src/core/iomgr/iomgr.c
	src/core/iomgr/tcp_client_posix.c
2015-07-22 07:43:38 -07:00
yang-g 70a1337045 merge head and resolve conflict 2015-07-22 00:08:06 -07:00
yang-g 8b25f2aaeb move fake_transport_security_credentials to private API 2015-07-21 23:54:36 -07:00
Julien Boeuf 5029b30d1c Adding option to force client auth on the server SSL creds. 2015-07-21 23:02:16 -07:00
Craig Tiller 4a4f1496c1 Rename grpc_channel_create to grpc_insecure_channel_create 2015-07-21 16:32:29 -07:00
Vijay Pai 23a33aaef5 Merge pull request #2529 from ctiller/prefer-gin-n-tonic
Move alarm subsystem to monotonic time
2015-07-21 14:20:43 -07:00