Commit Graph

186 Commits

Author SHA1 Message Date
Nicolas "Pixel" Noble 35b8c51485 Bumping version to 1.0.1-pre1. 2016-08-18 21:57:20 +02:00
Nicolas "Pixel" Noble a469e5d42e grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. 2016-08-17 05:47:55 +02:00
Stanley Cheung 7e8efc3ba8 php: update package.xml 2016-08-09 21:47:46 -07:00
Stanley Cheung 526a9f9086 php: cleanup for GA 2016-07-28 10:33:09 -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
Stanley Cheung ca931e4167 add new file to build.yaml 2016-07-25 12:46:21 -07:00
Stanley Cheung 31399d20d9 php: update package.xml to 1.0.0RC2 2016-07-21 20:28:11 -07:00
Stanley Cheung 67bccfed99 php: prepare for GA release 2016-07-13 08:37:29 -07:00
Nicolas "Pixel" Noble 8c72ae43f9 Flagging master as 1.0.0-pre1. 2016-07-12 09:18:18 +02:00
Stanley Cheung 2cb69ad203 php: update package.xml 2016-06-30 11:47:14 -07:00
murgatroid99 b2edc6c99a Resolved merge conflicts with master 2016-06-27 14:24:18 -07:00
Jan Tattermusch fb39f1d6dc Merge pull request #6973 from makdharma/network_status_change
Network status tracking
2016-06-27 10:02:11 -07:00
Craig Tiller ffc780d70e Merge pull request #6803 from sreecha/epoll_changes
New epoll based polling implementation
2016-06-25 08:43:50 -07:00
murgatroid99 d29a3bf004 Update master branch to 0.16.0-dev 2016-06-24 10:26:14 -07:00
Sree Kuchibhotla c3a9fae601 Merge branch 'master' into epoll_changes_merged 2016-06-21 16:31:35 -07:00
Makarand Dharmapurikar 0579cfc334 more files after running build.yaml changes through 2016-06-20 15:45:24 -07:00
murgatroid99 e16907e5a1 Resolved merge conflicts with master 2016-06-20 10:54:14 -07:00
Craig Tiller bc4c3e3a79 Merge github.com:grpc/grpc into error 2016-06-16 16:17:56 -07:00
Sree Kuchibhotla 812c66ba1b Merge branch 'master' into epoll_changes 2016-06-16 10:05:13 -07:00
murgatroid99 9f6a805977 Allow disabling traces, add trace variables for pluck and timeout events 2016-06-15 17:39:03 -07:00
Craig Tiller 13c0940f66 Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout 2016-06-15 09:41:33 -07:00
Jan Tattermusch f8bd01f934 Merge remote-tracking branch 'upstream/master' into manual_upmerge_0_14_to_master 2016-06-15 08:40:50 -07:00
Jan Tattermusch 5fa6b5db39 regenerate PHP's package.xml 2016-06-13 10:03:35 -07:00
Yuchen Zeng d7a15b86b7 Merge remote-tracking branch 'upstream/master' into base64_decode 2016-06-09 11:02:10 -07:00
Sree Kuchibhotla 877dc0cc49 Merge branch 'master' into epoll_changes 2016-06-09 10:02:58 -07:00
Craig Tiller 0ca68b7cb1 Merge github.com:grpc/grpc into error 2016-06-09 07:50:50 -07:00
Jan Tattermusch 1bc2976a0f Merge pull request #6481 from dgquintas/compression_md_level_bis
Allow servers to select compression level via initial MD & overall compression cleanup
2016-06-08 19:17:20 -07:00
Yuchen Zeng 0a0c1b0d59 Merge remote-tracking branch 'upstream/master' into base64_decode 2016-06-08 17:52:05 -07:00
Sree Kuchibhotla 5dbbbb1912 Merge branch 'master' into epoll_changes 2016-06-08 09:07:50 -07:00
David Garcia Quintas 533add5a87 Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis 2016-06-07 21:21:27 -07:00
Adam Michalik bf10c82bf8 implement support for adding external fd to server 2016-06-07 15:09:19 -07:00
Adam Michalik 321b1fb1c2 separate posix functionality to grpc_posix.h 2016-06-07 15:09:19 -07:00
Craig Tiller c97065da86 Merge github.com:grpc/grpc into error 2016-06-07 13:00:14 -07:00
Craig Tiller 2888bd58b0 Merge github.com:grpc/grpc into error 2016-06-07 11:00:42 -07:00
David Garcia Quintas a0d7491e62 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-06-06 16:25:48 -07:00
Jan Tattermusch 87ec3b77b5 Merge pull request #6750 from makdharma/cronet
cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code.
2016-06-06 12:44:12 -07:00
Sree Kuchibhotla 1fd6235791 Merge branch 'master' into epoll_changes 2016-06-06 10:31:45 -07:00
Sree Kuchibhotla 4c11a20bf0 Remove unused files 2016-06-06 09:30:30 -07:00
Craig Tiller d925c93047 Merge github.com:grpc/grpc into error 2016-06-06 08:38:50 -07:00
David Garcia Quintas 55c08f81cf Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis 2016-06-03 14:18:01 -07:00
Jan Tattermusch 6c81c25653 Merge pull request #6306 from y-zeng/win32_suffix
Change win32 file suffix
2016-06-03 16:13:51 -04:00
David Garcia Quintas e7518461c2 Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-06-02 10:24:51 -07:00
Makarand Dharmapurikar 2a2599b5ca incremental fix - removed cronet dependency from grpc_secure 2016-06-01 15:19:06 -07:00
Makarand Dharmapurikar 38d8055306 cronet build related changes 2016-06-01 15:02:04 -07:00
Craig Tiller 4b5e757147 Merge github.com:grpc/grpc into error 2016-06-01 14:55:33 -07:00
Jan Tattermusch 6eb2380a8f Merge pull request #6702 from a-veitch/add_proto
Add census protos.
2016-06-01 14:38:06 -04:00
Craig Tiller 4c751ebd50 Merge github.com:grpc/grpc into error 2016-06-01 09:34:42 -07:00
David Garcia Quintas 2a50dfefdc s/grpc_pops/grpc_polling_entity 2016-05-31 15:10:58 -07:00
Yuchen Zeng 4594bd9d1b Merge remote-tracking branch 'upstream/master' into base 2016-05-31 14:19:57 -07:00
David Garcia Quintas 8bec6f6a55 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-05-31 13:59:37 -07:00