diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-01 15:46:00 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-01 15:46:00 -0700 |
| commit | 895459efc02bf77c7f19d94e5db945f5192917e3 (patch) | |
| tree | ba4204b6d3c05d39913ef538e3b55472cdfc403e /package.json | |
| parent | 4a6dad3970d1af3a8804be149576eae561cfe4b8 (diff) | |
| parent | abcebb07983ae4b1824cb4481462cd4b234e149a (diff) | |
Merge github.com:grpc/grpc into optionalize_client_config
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/package.json b/package.json index 18efce7d6a..2ebb731300 100644 --- a/package.json +++ b/package.json @@ -161,17 +161,16 @@ "src/core/lib/iomgr/closure.h", "src/core/lib/iomgr/endpoint.h", "src/core/lib/iomgr/endpoint_pair.h", + "src/core/lib/iomgr/ev_poll_and_epoll_posix.h", + "src/core/lib/iomgr/ev_posix.h", "src/core/lib/iomgr/exec_ctx.h", "src/core/lib/iomgr/executor.h", - "src/core/lib/iomgr/fd_posix.h", "src/core/lib/iomgr/iocp_windows.h", "src/core/lib/iomgr/iomgr.h", "src/core/lib/iomgr/iomgr_internal.h", "src/core/lib/iomgr/iomgr_posix.h", "src/core/lib/iomgr/pollset.h", - "src/core/lib/iomgr/pollset_posix.h", "src/core/lib/iomgr/pollset_set.h", - "src/core/lib/iomgr/pollset_set_posix.h", "src/core/lib/iomgr/pollset_set_windows.h", "src/core/lib/iomgr/pollset_windows.h", "src/core/lib/iomgr/resolve_address.h", @@ -311,17 +310,14 @@ "src/core/lib/iomgr/endpoint.c", "src/core/lib/iomgr/endpoint_pair_posix.c", "src/core/lib/iomgr/endpoint_pair_windows.c", + "src/core/lib/iomgr/ev_poll_and_epoll_posix.c", + "src/core/lib/iomgr/ev_posix.c", "src/core/lib/iomgr/exec_ctx.c", "src/core/lib/iomgr/executor.c", - "src/core/lib/iomgr/fd_posix.c", "src/core/lib/iomgr/iocp_windows.c", "src/core/lib/iomgr/iomgr.c", "src/core/lib/iomgr/iomgr_posix.c", "src/core/lib/iomgr/iomgr_windows.c", - "src/core/lib/iomgr/pollset_multipoller_with_epoll.c", - "src/core/lib/iomgr/pollset_multipoller_with_poll_posix.c", - "src/core/lib/iomgr/pollset_posix.c", - "src/core/lib/iomgr/pollset_set_posix.c", "src/core/lib/iomgr/pollset_set_windows.c", "src/core/lib/iomgr/pollset_windows.c", "src/core/lib/iomgr/resolve_address_posix.c", |