commit 43713e6ae1de899a1bbdbe49eb14fabe7d5b6146
author Jan Tattermusch <jtattermusch@google.com> Wed Apr 12 09:20:29 2017 +0200
committer Jan Tattermusch <jtattermusch@google.com> Wed Apr 12 09:20:29 2017 +0200
tree d0930fb71ebcdde700a4a89abd2c64834dbaa839
parent f200f25d4dad5b74e7216a2b17fa2c2783ceb40e
parent ca70b1ce9eaa7e4856dcbe3b0386a846452226c9

Merge remote-tracking branch 'upstream/v1.2.x' into HEAD

BUILD

diff --git a/BUILD b/BUILD
index ab4c1cf..1432288 100644
--- a/BUILD
+++ b/BUILD
@@ -457,7 +457,6 @@
         "src/core/lib/iomgr/endpoint_pair_windows.c",
         "src/core/lib/iomgr/error.c",
         "src/core/lib/iomgr/ev_epoll_linux.c",
-        "src/core/lib/iomgr/lockfree_event.c",
         "src/core/lib/iomgr/ev_poll_posix.c",
         "src/core/lib/iomgr/ev_posix.c",
         "src/core/lib/iomgr/exec_ctx.c",
@@ -468,6 +467,7 @@
         "src/core/lib/iomgr/iomgr_uv.c",
         "src/core/lib/iomgr/iomgr_windows.c",
         "src/core/lib/iomgr/load_file.c",
+        "src/core/lib/iomgr/lockfree_event.c",
         "src/core/lib/iomgr/network_status_tracker.c",
         "src/core/lib/iomgr/polling_entity.c",
         "src/core/lib/iomgr/pollset_set_uv.c",
@@ -584,7 +584,6 @@
         "src/core/lib/iomgr/error.h",
         "src/core/lib/iomgr/error_internal.h",
         "src/core/lib/iomgr/ev_epoll_linux.h",
-        "src/core/lib/iomgr/lockfree_event.h",
         "src/core/lib/iomgr/ev_poll_posix.h",
         "src/core/lib/iomgr/ev_posix.h",
         "src/core/lib/iomgr/exec_ctx.h",
@@ -594,6 +593,7 @@
         "src/core/lib/iomgr/iomgr_internal.h",
         "src/core/lib/iomgr/iomgr_posix.h",
         "src/core/lib/iomgr/load_file.h",
+        "src/core/lib/iomgr/lockfree_event.h",
         "src/core/lib/iomgr/network_status_tracker.h",
         "src/core/lib/iomgr/polling_entity.h",
         "src/core/lib/iomgr/pollset.h",