Commit Graph

245 Commits

Author SHA1 Message Date
Craig Tiller a51f54192a Merge pull request #7559 from dgquintas/codegen_cleanse
Removed references to public APIs from codegen/
2016-09-13 19:40:43 -07:00
Craig Tiller 537f7c2a13 Revert "Grand unified closures" 2016-09-12 11:56:39 -07:00
Craig Tiller 344834b40b Merge github.com:grpc/grpc into grand-unified-closures 2016-09-07 08:39:05 -07:00
Craig Tiller e0321637d7 Merge pull request #7774 from ctiller/percent-encoder
Percent encoding routines
2016-09-06 22:08:12 -07:00
Craig Tiller 255dad3630 Merge github.com:grpc/grpc into grand-unified-closures 2016-09-02 09:15:23 -07:00
David Garcia Quintas e44902ecc9 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-02 15:27:33 +02:00
Mark D. Roth 79620aaa10 Merge pull request #7943 from markdroth/client_channel_cleanup
Move subchannel_call_holder code into client_channel module.
2016-09-01 13:12:56 -07:00
David Garcia Quintas d3dee72437 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-01 20:18:41 +02:00
Mark D. Roth 4c0fe49f76 Move subchannel_call_holder code into client_channel module. 2016-08-31 13:51:55 -07:00
Alistair Veitch a0c69f9099 add trace context proto 2016-08-31 12:01:27 -07:00
Craig Tiller dadda8bf52 Merge github.com:grpc/grpc into grand-unified-closures 2016-08-30 20:51:45 -07:00
David Garcia Quintas f3581bf90a Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-08-30 04:45:50 -07:00
Mark D. Roth 8e2c98adf0 Merge pull request #7839 from markdroth/rename_client_config
Rename grpc_client_config to grpc_resolver_result.
2016-08-29 13:27:23 -07:00
Stanley Cheung 129bca6c5b php: error out if metadata key is not legal 2016-08-26 19:54:57 -07:00
Nicolas Noble 668bf881a9 Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x
Upmerge from v1.0.x
2016-08-23 14:59:39 -07:00
Mark D. Roth ff4df06a66 Rename grpc_client_config to grpc_resolver_result. 2016-08-22 15:02:49 -07:00
Stanley Cheung 557aa4e695 php: bump version 2016-08-22 08:51:47 -07:00
Nicolas "Pixel" Noble e3e17d3f6b Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Nicolas "Pixel" Noble 35b8c51485 Bumping version to 1.0.1-pre1. 2016-08-18 21:57:20 +02:00
Craig Tiller 17ed6b17c7 Percent encoding routines 2016-08-18 09:33:33 -07:00
Nicolas "Pixel" Noble a469e5d42e grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. 2016-08-17 05:47:55 +02:00
Nicolas "Pixel" Noble e1ee20bde6 Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge 2016-08-16 01:54:33 +02:00
Stanley Cheung 7e8efc3ba8 php: update package.xml 2016-08-09 21:47:46 -07:00
Craig Tiller 106df11093 Merge github.com:grpc/grpc into grand-unified-closures 2016-08-04 09:22:34 -07:00
kpayson64 5e1fbd2061 Merge pull request #7370 from rjshade/move_timeout_encoding
Move timeout_encoding to core/lib/transport
2016-08-02 16:20:01 -07:00
kpayson64 329d6473db Merge pull request #6774 from a-veitch/add_resource
Add Census resource API and implementation.
2016-08-02 12:46:43 -07:00
David Garcia Quintas 1f32ae4e84 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-08-02 10:24:44 -07:00
David Garcia Quintas 8c5424f0d5 added gpr_types.h 2016-08-01 22:49:00 -07:00
David Garcia Quintas 87e06c84fd Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 2016-08-01 11:02:22 -07:00
Stanley Cheung 526a9f9086 php: cleanup for GA 2016-07-28 10:33:09 -07:00
Stanley Cheung 8e56502457 php: cleanup for GA 2016-07-28 10:32:43 -07:00
David Garcia Quintas e8fd66b71d removed codegen/slice_buffer.h and scrubbed codegen/slice.h 2016-07-27 22:05:37 -07:00
David Garcia Quintas c79b0650d2 removed codegen/log.h 2016-07-27 21:11:58 -07:00
David Garcia Quintas 1399e466b0 removed codegen/time.h 2016-07-27 20:31:55 -07:00
David Garcia Quintas 3b31fdf77b removed codegen/byte_buffer.h 2016-07-27 18:17:12 -07:00
David Garcia Quintas 6b11462da1 removed codegen/alloc.h 2016-07-27 14:49:53 -07:00
kpayson64 66ebd08818 Merge pull request #7499 from thinkerou/wrap_php7_on_v1_branch
PHP: use php7_wrapper to reduce dup-codes on v1.0.x branch
2016-07-26 10:33:17 -07:00
kpayson64 ba33b53884 Merge pull request #7498 from thinkerou/wrap_php7
PHP: use php7_wrapper to reduce duplicated codes(first part)
2016-07-26 10:32:34 -07:00
Robbie Shade 43b633d54f Merge branch 'master' into move_timeout_encoding 2016-07-26 07:44:10 -04:00
Stanley Cheung 33e3dee12d add file to build.yaml 2016-07-25 12:50:09 -07:00
Stanley Cheung ca931e4167 add new file to build.yaml 2016-07-25 12:46:21 -07:00
kpayson64 de2d9fc07b Merge pull request #7395 from markdroth/handshake_api
General-purpose handshaker API.
2016-07-25 10:01:47 -07:00
Craig Tiller 3e426718f0 Merge github.com:grpc/grpc into grand-unified-closures 2016-07-24 13:00:57 -07:00
Stanley Cheung b8c87fd33d php: update package.xml to 1.0.0RC2 2016-07-21 22:37:42 -07:00
Stanley Cheung 31399d20d9 php: update package.xml to 1.0.0RC2 2016-07-21 20:28:11 -07:00
Alistair Veitch 3abd27e531 merge to upstream/master 2016-07-21 17:29:04 -07:00
Craig Tiller 64d8024a11 Merge github.com:grpc/grpc into grand-unified-closures 2016-07-15 07:53:33 -07:00
David Garcia Quintas 7c3ba12813 Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 2016-07-14 14:13:41 -07:00
Mark D. Roth ef31ba1e03 Merge remote-tracking branch 'upstream/master' into handshake_api 2016-07-14 13:58:42 -07:00
Mark D. Roth dfbdefedd3 Added handshaker.[ch] to build.yaml. 2016-07-14 09:18:22 -07:00