Commit Graph

1950 Commits

Author SHA1 Message Date
Karthik Ravi Shankar b657c8d79c
Revert "Revert "Move ServerContext from ::grpc_impl to ::grpc"" 2020-09-02 10:17:00 -07:00
Karthik Ravi Shankar f1abdd1725
Revert "Move ServerContext from ::grpc_impl to ::grpc" 2020-09-01 22:54:54 -07:00
Karthik Ravi Shankar 9afbf02198 Merge branch 'master' into server-context 2020-08-31 17:37:37 -07:00
Karthik Ravi Shankar 694bb50648
Merge pull request #23917 from karthikravis/server
Move Server from ::grpc_impl to ::grpc
2020-08-31 10:33:15 -07:00
Mark D. Roth 30e4170dc3 Update version of master to 1.33-dev ("geeky"). 2020-08-28 09:20:30 -07:00
Karthik Ravi Shankar 4903d62843 Merge branch 'master' into server-context 2020-08-25 11:47:31 -07:00
Karthik Ravi Shankar a68996fdd5 Merge branch 'master' into server 2020-08-25 11:46:42 -07:00
Jan Tattermusch cd90574c80 update ObjC to protobuf v3.13.0 2020-08-25 12:57:21 +02:00
Karthik Ravi Shankar 967c0a2a32 Move Server from ::grpc_impl to ::grpc
Reverts: https://github.com/grpc/grpc/pull/18458
2020-08-20 14:53:17 -07:00
Karthik Ravi Shankar a23578444c Fix and format build after rebase 2020-08-20 14:17:49 -07:00
Vijay Pai b3b304c3ba Remove unneeded data members already present in the base class 2020-08-20 00:45:21 -07:00
Karthik Ravi Shankar dc3e1097e9 Merge branch 'master' into server-context 2020-08-19 14:18:27 -07:00
ZhenLian 0369675656
Merge pull request #23848 from grpc/zhen_alts_peer_attr_plumbing
ALTS peer attributes plumbing
2020-08-19 11:59:46 -07:00
Jan Tattermusch c037f833e4
Merge pull request #23884 from markdroth/server_c++_fix
Destroy health check service before destroying C server.
2020-08-19 08:52:57 +02:00
donnadionne 6b80f4d7f2
Merge pull request #23569 from sammyKhan/master
Return blank span if no call is active.
2020-08-18 13:35:01 -07:00
Mark D. Roth 9a0435e83e Destroy health check service before destroying C server. 2020-08-18 10:33:26 -07:00
ZhenLian 0cdc36f64f ALTS peer attributes plumbing 2020-08-14 17:27:57 -07:00
Karthik Ravi Shankar 56d7d9e804 Move ServerContext from ::grpc_impl to ::grpc 2020-08-13 14:24:29 -07:00
Karthik Ravi Shankar 751b9c105f Move ClientContext from ::grpc_impl to ::grpc
Reverts: https://github.com/grpc/grpc/pull/19261
2020-08-11 16:28:50 -07:00
Karthik Ravi Shankar 15cce00f52
Revert "Revert "Fold Channel and CompletionQueue from grpc_impl to grpc"" 2020-08-06 20:42:54 -07:00
Karthik Ravi Shankar f3f9e8941a
Revert "Fold Channel and CompletionQueue from grpc_impl to grpc" 2020-08-06 15:56:09 -07:00
Karthik Ravi Shankar bc58a29a5f Merge branch 'master' into channel 2020-08-05 15:21:01 -07:00
Karthik Ravi Shankar ab775de1a2 Build and formatting fixes 2020-08-04 13:31:42 -07:00
Karthik Ravi Shankar 390132c87f Merge branch 'master' into channel 2020-08-04 11:48:10 -07:00
Karthik Ravi Shankar 75469d7ec0 Merge branch 'master' into channel-arguments 2020-08-04 11:39:11 -07:00
Mark D. Roth 0b61aea1c5 Convert grpc_server to idiomatic C++. 2020-08-03 12:56:29 -07:00
Karthik Ravi Shankar 9d81adf3ce
Merge pull request #23600 from karthikravis/server-credentials
Move ServerCredentials from ::grpc_impl to ::grpc
2020-07-31 10:50:32 -07:00
Karthik Ravi Shankar 3c2f4b40e3 Fold Channel and CompletionQueue from grpc_impl to grpc
Reverts: https://github.com/grpc/grpc/pull/19067
2020-07-30 16:45:28 -07:00
Karthik Ravi Shankar 30f7710d4a Move ChannelArguments from ::grpc_impl to ::grpc
Reverts: https://github.com/grpc/grpc/pull/18454
2020-07-30 14:59:53 -07:00
Karthik Ravi Shankar 2a2232275b Merge branch 'master' into fold-errors 2020-07-29 09:59:35 -07:00
Karthik Ravi Shankar be7bab5cb8 Merge branch 'master' into server-credentials 2020-07-28 16:30:07 -07:00
Karthik Ravi Shankar dbec2415bf More local fixes 2020-07-27 11:37:19 -07:00
Karthik Ravi Shankar 1de0bfd9e2
Revert "Revert "Move create_channel and credentials from ::grpc_impl to ::grpc"" 2020-07-24 12:47:33 -07:00
Karthik Ravi Shankar f1bc43edf6
Revert "Move create_channel and credentials from ::grpc_impl to ::grpc" 2020-07-24 11:08:54 -07:00
Karthik Ravi Shankar db3cd51b2f Move ErrorDetails from ::grpc_impl to ::grpc
Reverts: https://github.com/grpc/grpc/pull/18455
2020-07-23 16:58:51 -07:00
Karthik Ravi Shankar 2fc4cfadcf Move ServerCredentials from ::grpc_impl to ::grpc
Reverts: https://github.com/grpc/grpc/pull/18452
2020-07-23 16:18:23 -07:00
Sam Khan 9dc71643fa Return blank span if no call is active.
Otherwise unit tests of gRPC servers that call GetSpanFromServerContext
segfault.
2020-07-23 11:46:37 +02:00
Karthik Ravi Shankar 9ad399384a Merge branch 'master' into create-channel 2020-07-23 00:47:36 -07:00
Jan Tattermusch aa0193db42
Merge pull request #23576 from jtattermusch/bump_master_1_32
update master version to 1.32.0-dev
2020-07-23 07:48:24 +02:00
Richard Belleville 089d90933a
Merge pull request #23203 from gnossen/python_google_default_creds
Implement compute_engine_channel_credentials in Python
2020-07-22 13:14:54 -07:00
Jan Tattermusch 80daba44d9 regenerate projects 2020-07-22 17:38:48 +02:00
Karthik Ravi Shankar 3253bb32e7
Merge pull request #23471 from karthikravis/proto-server
Move ProtoServerReflectionPlugin from grpc_impl to grpc namespace
2020-07-16 14:14:41 -07:00
Karthik Ravi Shankar f9fac8a6b7 Move ProtoServerReflectionPlugin from grpc_impl to grpc namespace
Reverts: https://github.com/grpc/grpc/pull/18600
2020-07-13 14:57:01 -07:00
Karthik Ravi Shankar 69f8d308cb Move LoadReportingServiceServerBuilderOption from ::grpc_impl to ::grpc
Reverts: https://github.com/grpc/grpc/pull/18419/files
2020-07-13 14:50:33 -07:00
Karthik Ravi Shankar e6a6fdb313 Fix secure test 2020-07-13 13:05:42 -07:00
Karthik Ravi Shankar 1999b20c7d Merge branch 'master' into create-channel 2020-07-13 10:58:31 -07:00
Richard Belleville 56ed8f3be4 Merge remote-tracking branch 'origin/master' into python_google_default_creds 2020-07-10 01:09:58 +00:00
Richard Belleville ff5f4bb6fc Add test 2020-07-10 00:31:23 +00:00
Richard Belleville d067b63d48 WIP 2020-07-08 23:09:57 +00:00
Esun Kim 8d0e703393
Merge pull request #22813 from mehrdada/fix-static-initialization-crap
Fix channelz plugin initializer
2020-07-06 11:19:05 -07:00