diff options
author | Sree Kuchibhotla <sreek@google.com> | 2017-05-03 15:42:42 -0700 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2017-05-03 15:42:42 -0700 |
commit | 1440b0654d1b53071f94d1199296493d268462d5 (patch) | |
tree | 5c44dc6b827ebe6f694266eb403f2c2a52892066 /binding.gyp | |
parent | c5cae77ef5f3fa0d2401cb648020a35295b9c8b5 (diff) | |
parent | 98e8d59ece3cd24cec29c2d6b4928bf0409c13e3 (diff) |
Merge branch 'master' into epoll_thread_pool
Diffstat (limited to 'binding.gyp')
-rw-r--r-- | binding.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/binding.gyp b/binding.gyp index 2584c6af6b..aa038cfb30 100644 --- a/binding.gyp +++ b/binding.gyp @@ -856,8 +856,10 @@ 'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create.c', 'src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.c', 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c', 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.c', + 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.c', 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.c', 'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c', 'third_party/nanopb/pb_common.c', |