Commit Graph

776 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
Craig Tiller 74a096980d Fix UDS versions of this test 2015-07-31 17:16:22 -07:00
Craig Tiller 2cd9dd9da6 Remove optional parameter from watch connectivity state 2015-07-31 16:34:37 -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
Craig Tiller 7d024c7369 Merge pull request #2689 from yang-g/auth_test_failure
Fix clock type mismatch
2015-07-30 07:47:12 -07:00
Craig Tiller a7957f50af Exclude uds from default hostname tests 2015-07-29 18:48:38 -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
Craig Tiller 8a67d39ada Integration compile fix 2015-07-28 07:41:54 -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
yang-g c5eccd45f4 Fix clock type mismatch 2015-07-28 00:23:50 -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
Yang Gao f2b2558cc3 Merge pull request #2593 from ctiller/elliptic-orange-chamelion
Rename grpc_channel_create to grpc_insecure_channel_create
2015-07-27 14:15:48 -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 cbc4fb9f2e Merge github.com:grpc/grpc into warbling-wombat 2015-07-26 12:54:23 -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 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
Craig Tiller c4b56b67a2 Make passing NULL for host not crash 2015-07-23 17:44:11 -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 0ee2d20daa Merge github.com:grpc/grpc into warbling-wombat 2015-07-23 10:51:13 -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 6999c096d8 Canonicalize metadata keys in core 2015-07-22 08:14:12 -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
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
Craig Tiller 90220b3241 Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other 2015-07-21 12:19:34 -07:00
Craig Tiller 1b22b9db94 Add grpc_call_get_peer 2015-07-20 13:42:22 -07:00
Craig Tiller 698d00c60e Add ipv4:, ipv6: schemes 2015-07-20 12:32:58 -07:00
Craig Tiller 9d25e94682 Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other 2015-07-20 10:31:12 -07:00
Craig Tiller b4fdd32100 Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY
Conflicts:
	src/cpp/client/channel_arguments.cc
2015-07-19 22:26:26 -07:00
Craig Tiller 6a7626c98f Move alarm subsystem to monotonic time 2015-07-19 22:21:41 -07:00
Craig Tiller b4e70366c6 Merge branch 'decompression' of https://github.com/dgquintas/grpc into dgquintas-decompression
Conflicts:
	Makefile
	vsprojects/Grpc.mak
2015-07-19 15:35:17 -07:00
Nicolas Noble d82d0b295b Merge pull request #2319 from dgquintas/str_join_with_sep
Added convenience functions gpr_strjoin_sep and grp_strsplit
2015-07-19 10:21:33 -07:00
Craig Tiller 0dc5e6cf16 User agent string support 2015-07-18 20:39:34 -07:00
Craig Tiller b5980be9a0 Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other 2015-07-17 22:59:53 -07:00
yang-g 5e7e55b957 Merge with head and resolve conflict 2015-07-17 22:15:12 -07:00
Vijay Pai f87a0984ab Merge pull request #2470 from ctiller/i-want-to-wait-free
Lock free requested call fulfillment path
2015-07-17 16:05:28 -07:00
David Garcia Quintas 6016e260ca Merge branch 'master' of github.com:grpc/grpc into str_join_with_sep 2015-07-17 16:02:15 -07:00
Nicolas Noble e9881bbaf3 Merge pull request #2403 from ctiller/no-worries-i-can-wait
Add a clock_type field to gpr_timespec
2015-07-17 15:39:28 -07:00
David Garcia Quintas cadbf22467 Removed compression levels from clients and _experimental_'d signature of methods manipulating compression algorithms 2015-07-17 15:33:13 -07:00
Craig Tiller efccb3f5ce Merge pull request #2472 from nicolasnoble/4000-is-infinite-right
Changing a very long (4000s) deadline to 10s.
2015-07-17 15:15:04 -07:00
Craig Tiller e086725e4c Merge branch 'no-worries-i-can-wait' of github.com:ctiller/grpc into no-worries-i-can-wait 2015-07-17 14:41:32 -07:00
Craig Tiller c9fef6f521 Merge github.com:grpc/grpc into no-worries-i-can-wait 2015-07-17 14:41:12 -07:00
Craig Tiller af26143b6f Merge github.com:grpc/grpc into i-want-to-wait-free 2015-07-17 14:36:45 -07:00
Craig Tiller be2b9b2563 Merge pull request #2463 from dgquintas/bitsetmacros
Added bitset macro ops
2015-07-17 12:59:51 -07:00
Nicolas "Pixel" Noble aff4f2a0cc Changing a very long (4000s) deadline to 10s. 2015-07-17 21:48:35 +02:00