diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-06-27 14:24:18 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-06-27 14:24:18 -0700 |
| commit | b2edc6c99a26e158c3230188b0a5f5c4848aa224 (patch) | |
| tree | e235e77acb8cd37873720008d0db4f1cd120c8e5 /grpc.gemspec | |
| parent | 5fec4bf5f34792e30d2691024cbd9914626db0a3 (diff) | |
| parent | a9df5d1029b303a305481c4bb765c6bed2e8ebbb (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'grpc.gemspec')
| -rwxr-xr-x | grpc.gemspec | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 70846a4705..369851b0f2 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -189,6 +189,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/endpoint.h ) s.files += %w( src/core/lib/iomgr/endpoint_pair.h ) s.files += %w( src/core/lib/iomgr/error.h ) + s.files += %w( src/core/lib/iomgr/ev_epoll_linux.h ) s.files += %w( src/core/lib/iomgr/ev_poll_and_epoll_posix.h ) s.files += %w( src/core/lib/iomgr/ev_poll_posix.h ) s.files += %w( src/core/lib/iomgr/ev_posix.h ) @@ -199,6 +200,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/iomgr_internal.h ) s.files += %w( src/core/lib/iomgr/iomgr_posix.h ) s.files += %w( src/core/lib/iomgr/load_file.h ) + s.files += %w( src/core/lib/iomgr/network_status_tracker.h ) s.files += %w( src/core/lib/iomgr/polling_entity.h ) s.files += %w( src/core/lib/iomgr/pollset.h ) s.files += %w( src/core/lib/iomgr/pollset_set.h ) @@ -343,6 +345,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/endpoint_pair_posix.c ) s.files += %w( src/core/lib/iomgr/endpoint_pair_windows.c ) s.files += %w( src/core/lib/iomgr/error.c ) + s.files += %w( src/core/lib/iomgr/ev_epoll_linux.c ) s.files += %w( src/core/lib/iomgr/ev_poll_and_epoll_posix.c ) s.files += %w( src/core/lib/iomgr/ev_poll_posix.c ) s.files += %w( src/core/lib/iomgr/ev_posix.c ) @@ -353,6 +356,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/iomgr_posix.c ) s.files += %w( src/core/lib/iomgr/iomgr_windows.c ) s.files += %w( src/core/lib/iomgr/load_file.c ) + s.files += %w( src/core/lib/iomgr/network_status_tracker.c ) s.files += %w( src/core/lib/iomgr/polling_entity.c ) s.files += %w( src/core/lib/iomgr/pollset_set_windows.c ) s.files += %w( src/core/lib/iomgr/pollset_windows.c ) |