Resolved merge conflicts with master

1 files changed, 112 insertions, 28 deletions

diff --git a/build.json b/build.json
index deb8640422..896cbee8c8 100644
--- a/build.json
+++ b/build.json
@@ -7,7 +7,7 @@
     "version": {
       "major": 0,
       "minor": 10,
-      "micro": 0,
+      "micro": 1,
       "build": 0
     }
   },
@@ -33,7 +33,6 @@
         "include/grpc++/async_generic_service.h",
         "include/grpc++/async_unary_call.h",
         "include/grpc++/auth_context.h",
-        "include/grpc++/auth_property_iterator.h",
         "include/grpc++/byte_buffer.h",
         "include/grpc++/channel_arguments.h",
         "include/grpc++/channel_interface.h",
@@ -69,6 +68,7 @@
         "include/grpc++/status.h",
         "include/grpc++/status_code_enum.h",
         "include/grpc++/stream.h",
+        "include/grpc++/stub_options.h",
         "include/grpc++/thread_pool_interface.h",
         "include/grpc++/time.h"
       ],
@@ -140,6 +140,9 @@
         "src/core/client_config/uri_parser.h",
         "src/core/compression/message_compress.h",
         "src/core/debug/trace.h",
+        "src/core/httpcli/format_request.h",
+        "src/core/httpcli/httpcli.h",
+        "src/core/httpcli/parser.h",
         "src/core/iomgr/alarm.h",
         "src/core/iomgr/alarm_heap.h",
         "src/core/iomgr/alarm_internal.h",
@@ -151,7 +154,6 @@
         "src/core/iomgr/iomgr_internal.h",
         "src/core/iomgr/iomgr_posix.h",
         "src/core/iomgr/pollset.h",
-        "src/core/iomgr/pollset_kick_posix.h",
         "src/core/iomgr/pollset_posix.h",
         "src/core/iomgr/pollset_set.h",
         "src/core/iomgr/pollset_set_posix.h",
@@ -239,6 +241,9 @@
         "src/core/compression/algorithm.c",
         "src/core/compression/message_compress.c",
         "src/core/debug/trace.c",
+        "src/core/httpcli/format_request.c",
+        "src/core/httpcli/httpcli.c",
+        "src/core/httpcli/parser.c",
         "src/core/iomgr/alarm.c",
         "src/core/iomgr/alarm_heap.c",
         "src/core/iomgr/endpoint.c",
@@ -249,7 +254,6 @@
         "src/core/iomgr/iomgr.c",
         "src/core/iomgr/iomgr_posix.c",
         "src/core/iomgr/iomgr_windows.c",
-        "src/core/iomgr/pollset_kick_posix.c",
         "src/core/iomgr/pollset_multipoller_with_epoll.c",
         "src/core/iomgr/pollset_multipoller_with_poll_posix.c",
         "src/core/iomgr/pollset_posix.c",
@@ -331,6 +335,7 @@
       "name": "grpc_test_util_base",
       "headers": [
         "test/core/end2end/cq_verifier.h",
+        "test/core/end2end/fixtures/proxy.h",
         "test/core/iomgr/endpoint_tests.h",
         "test/core/security/oauth2_utils.h",
         "test/core/util/grpc_profiler.h",
@@ -340,6 +345,7 @@
       ],
       "src": [
         "test/core/end2end/cq_verifier.c",
+        "test/core/end2end/fixtures/proxy.c",
         "test/core/iomgr/endpoint_tests.c",
         "test/core/security/oauth2_utils.c",
         "test/core/util/grpc_profiler.c",
@@ -461,10 +467,6 @@
         "include/grpc/grpc_security.h"
       ],
       "headers": [
-        "src/core/httpcli/format_request.h",
-        "src/core/httpcli/httpcli.h",
-        "src/core/httpcli/httpcli_security_connector.h",
-        "src/core/httpcli/parser.h",
         "src/core/security/auth_filters.h",
         "src/core/security/base64.h",
         "src/core/security/credentials.h",
@@ -480,10 +482,7 @@
         "src/core/tsi/transport_security_interface.h"
       ],
       "src": [
-        "src/core/httpcli/format_request.c",
-        "src/core/httpcli/httpcli.c",
         "src/core/httpcli/httpcli_security_connector.c",
-        "src/core/httpcli/parser.c",
         "src/core/security/base64.c",
         "src/core/security/client_auth_filter.c",
         "src/core/security/credentials.c",
@@ -574,6 +573,23 @@
       "vs_project_guid": "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}"
     },
     {
+      "name": "reconnect_server",
+      "build": "private",
+      "language": "c",
+      "headers": [
+        "test/core/util/reconnect_server.h"
+      ],
+      "src": [
+        "test/core/util/reconnect_server.c"
+      ],
+      "deps": [
+        "grpc_test_util",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
       "name": "grpc++",
       "build": "all",
       "language": "c++",
@@ -967,6 +983,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -984,6 +1002,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1001,6 +1021,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1048,6 +1070,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1065,6 +1089,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1538,6 +1564,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1679,23 +1707,6 @@
       ]
     },
     {
-      "name": "poll_kick_posix_test",
-      "build": "test",
-      "language": "c",
-      "src": [
-        "test/core/iomgr/poll_kick_posix_test.c"
-      ],
-      "deps": [
-        "grpc_test_util",
-        "grpc",
-        "gpr_test_util",
-        "gpr"
-      ],
-      "platforms": [
-        "posix"
-      ]
-    },
-    {
       "name": "resolve_address_test",
       "build": "test",
       "language": "c",
@@ -1751,6 +1762,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1768,6 +1781,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1785,6 +1800,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1905,6 +1922,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1925,6 +1944,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -1986,6 +2007,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2227,6 +2250,8 @@
         "grpc++_test_config"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2248,6 +2273,8 @@
         "grpc++_test_config"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2265,6 +2292,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2372,6 +2401,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2393,6 +2424,8 @@
         "grpc++_test_config"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2414,6 +2447,8 @@
         "grpc++_test_config"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2440,6 +2475,49 @@
       ]
     },
     {
+      "name": "reconnect_interop_client",
+      "build": "test",
+      "run": false,
+      "language": "c++",
+      "src": [
+        "test/proto/empty.proto",
+        "test/proto/messages.proto",
+        "test/proto/test.proto",
+        "test/cpp/interop/reconnect_interop_client.cc"
+      ],
+      "deps": [
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr",
+        "grpc++_test_config"
+      ]
+    },
+    {
+      "name": "reconnect_interop_server",
+      "build": "test",
+      "run": false,
+      "language": "c++",
+      "src": [
+        "test/proto/empty.proto",
+        "test/proto/messages.proto",
+        "test/proto/test.proto",
+        "test/cpp/interop/reconnect_interop_server.cc"
+      ],
+      "deps": [
+        "reconnect_server",
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr",
+        "grpc++_test_config"
+      ]
+    },
+    {
       "name": "secure_auth_context_test",
       "build": "test",
       "language": "c++",
@@ -2468,6 +2546,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2520,6 +2600,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },
@@ -2540,6 +2622,8 @@
         "gpr"
       ],
       "platforms": [
+        "mac",
+        "linux",
         "posix"
       ]
     },