---

pongad · web-flow · commit 20efeb6460eb · 2017-04-07T15:29:51.000+10:00
yaml --- r: 5551 b: refs/heads/master c: c2fb49e h: refs/heads/master i: 5549: ced9ca0 5547: f087cc4 5543: 183fe45 5535: f330cb2
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c531a0a0f1e59b10044c7941fdf77165e701d88a
+refs/heads/master: c2fb49ea1efafd8be4605aaae03bde7bfd57d0e3
 refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
 refs/heads/gh-pages: 049a9668af6afce3b5840dee8be005b0e6b43506
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/trunk/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java
@@ -214,9 +214,7 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
    */
   public static ChannelProvider setUpChannelProvider(
       InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
-    HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost());
-    providerBuilder.setServiceAddress(hostAndPort.getHostText())
-        .setPort(hostAndPort.getPort())
+    providerBuilder.setEndpoint(serviceOptions.getHost())
         .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
             firstNonNull(ServiceOptions.getLibraryVersion(), ""));
     Credentials scopedCredentials = serviceOptions.getScopedCredentials();
