grpclb: sync with grpc-proto

4 files changed, 23 insertions, 18 deletions

diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
index 3c45cf614..48c681b9a 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java
@@ -84,7 +84,7 @@ private static final long serialVersionUID = 0L;
   private volatile java.lang.Object name_;
   /**
    * <pre>
-   * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+   * Name of load balanced service (IE, service.googleapis.com). Its
    * length should be less than 256 bytes.
    * </pre>
    *
@@ -104,7 +104,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+   * Name of load balanced service (IE, service.googleapis.com). Its
    * length should be less than 256 bytes.
    * </pre>
    *
@@ -410,7 +410,7 @@ private static final long serialVersionUID = 0L;
     private java.lang.Object name_ = "";
     /**
      * <pre>
-     * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+     * Name of load balanced service (IE, service.googleapis.com). Its
      * length should be less than 256 bytes.
      * </pre>
      *
@@ -430,7 +430,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+     * Name of load balanced service (IE, service.googleapis.com). Its
      * length should be less than 256 bytes.
      * </pre>
      *
@@ -451,7 +451,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+     * Name of load balanced service (IE, service.googleapis.com). Its
      * length should be less than 256 bytes.
      * </pre>
      *
@@ -469,7 +469,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+     * Name of load balanced service (IE, service.googleapis.com). Its
      * length should be less than 256 bytes.
      * </pre>
      *
@@ -483,7 +483,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+     * Name of load balanced service (IE, service.googleapis.com). Its
      * length should be less than 256 bytes.
      * </pre>
      *
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java
index f30257f28..46dd693c6 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequestOrBuilder.java
@@ -9,7 +9,7 @@ public interface InitialLoadBalanceRequestOrBuilder extends
 
   /**
    * <pre>
-   * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+   * Name of load balanced service (IE, service.googleapis.com). Its
    * length should be less than 256 bytes.
    * </pre>
    *
@@ -18,7 +18,7 @@ public interface InitialLoadBalanceRequestOrBuilder extends
   java.lang.String getName();
   /**
    * <pre>
-   * Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+   * Name of load balanced service (IE, service.googleapis.com). Its
    * length should be less than 256 bytes.
    * </pre>
    *
diff --git a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java
index 7e6eaff06..74ac6f784 100644
--- a/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java
+++ b/grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java
@@ -93,8 +93,10 @@ public final class LoadBalancerProto {
       "\005\022\032\n\022load_balance_token\030\003 \001(\t\022\014\n\004drop\030\004 " +
       "\001(\010J\004\010\005\020\0062b\n\014LoadBalancer\022R\n\013BalanceLoad" +
       "\022\036.grpc.lb.v1.LoadBalanceRequest\032\037.grpc." +
-      "lb.v1.LoadBalanceResponse(\0010\001B%\n\016io.grpc" +
-      ".grpclbB\021LoadBalancerProtoP\001b\006proto3"
+      "lb.v1.LoadBalanceResponse(\0010\001BX\n\016io.grpc" +
+      ".grpclbB\021LoadBalancerProtoP\001Z1google.gol" +
+      "ang.org/grpc/balancer/grpclb/grpc_lb_v1b" +
+      "\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
diff --git a/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto b/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
index b250cee6b..2131401df 100644
--- a/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
+++ b/grpclb/src/main/proto/grpc/lb/v1/load_balancer.proto
@@ -12,22 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// The GRPCLB LoadBalancing protocol
+// This file defines an the GRPCLB LoadBalancing protocol.
+//
+// The canonical version of this proto can be found at
+// https://github.com/grpc/grpc-proto/blob/master/grpc/lb/v1/load_balancer.proto
 syntax = "proto3";
 
+package grpc.lb.v1;
+
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-package grpc.lb.v1;
-
+option go_package = "google.golang.org/grpc/balancer/grpclb/grpc_lb_v1";
 option java_multiple_files = true;
-option java_package = "io.grpc.grpclb";
 option java_outer_classname = "LoadBalancerProto";
+option java_package = "io.grpc.grpclb";
 
 service LoadBalancer {
   // Bidirectional rpc to get a list of servers.
-  rpc BalanceLoad(stream LoadBalanceRequest)
-      returns (stream LoadBalanceResponse);
+  rpc BalanceLoad(stream LoadBalanceRequest) returns (stream LoadBalanceResponse);
 }
 
 message LoadBalanceRequest {
@@ -42,7 +45,7 @@ message LoadBalanceRequest {
 }
 
 message InitialLoadBalanceRequest {
-  // Name of load balanced service (IE, service.blade.gslb.googleprod.com). Its
+  // Name of load balanced service (IE, service.googleapis.com). Its
   // length should be less than 256 bytes.
   string name = 1;
 }