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 |
|
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 |
|
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 |
|
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 |
|
Craig Tiller
|
69f3e2bf2e
|
Revert "Remove legacy poller"
This reverts commit d88e15cee7.
|
2016-05-31 13:45:24 -07:00 |
|
Sree Kuchibhotla
|
f448c34a68
|
Remove union { } data and epoll_hdr structures. Added ev_epoll_linux
files
|
2016-05-31 09:32:58 -07:00 |
|
Sree Kuchibhotla
|
e48b1bc011
|
Base changes. Create ev_epoll_posix.{c,h} files by making a copy of ev_poll_and_epoll.c file
|
2016-05-31 09:29:53 -07:00 |
|
Alistair Veitch
|
d69354e488
|
Merge branch 'master' into add_proto
|
2016-05-24 09:03:47 -07:00 |
|
Craig Tiller
|
48abdde197
|
Merge github.com:grpc/grpc into error
|
2016-05-24 06:55:28 -07:00 |
|
Craig Tiller
|
c4c6ecf8e9
|
Merge github.com:grpc/grpc into test_affine
|
2016-05-23 12:48:55 -07:00 |
|
Alistair Veitch
|
30fe63243a
|
end-to-end compilation
|
2016-05-23 10:11:28 -07:00 |
|
Craig Tiller
|
d88e15cee7
|
Remove legacy poller
|
2016-05-20 12:22:37 -07:00 |
|
David Garcia Quintas
|
772f485334
|
Merge branch 'master' of github.com:grpc/grpc into lr_hook
|
2016-05-19 14:56:03 -07:00 |
|
Julien Boeuf
|
a4880374f9
|
Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring
|
2016-05-18 22:12:43 -07:00 |
|
David Garcia Quintas
|
ac0944701a
|
Merge branch 'compression_incoming_checks' into compression_md_level_bis
|
2016-05-18 20:25:57 -07:00 |
|
Craig Tiller
|
8517886c6a
|
Move load_file into iomgr
|
2016-05-18 16:09:16 -07:00 |
|
David Garcia Quintas
|
d013e9b985
|
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
|
2016-05-18 11:00:31 -07:00 |
|
Craig Tiller
|
d6a5b803f4
|
Merge github.com:grpc/grpc into error
|
2016-05-13 20:17:38 -07:00 |
|
Jan Tattermusch
|
effd74c3cc
|
Merge pull request #5456 from ctiller/cleaner-posix3
Splitting out a pure poll() based event engine
|
2016-05-13 11:37:12 -07:00 |