googleapis
diff --git a/‎[refs]‎
Lines changed: 1 addition & 1 deletion b/‎[refs]‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/AbstractOption.java‎
Lines changed: 9 additions & 8 deletions b/‎branches/logging-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/AbstractOption.java‎
Lines changed: 9 additions & 8 deletions
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: 465f5327d81035666a12c1ef37bab0a1bfd55300
+refs/heads/logging-alpha: a8bee9c1e07337d1e710d378d7a600215e26c1ba
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
 
@@ -19,21 +19,21 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.base.MoreObjects;
-import com.google.gcloud.spi.DnsServiceRpc;
+import com.google.gcloud.spi.DnsRpc;
 
 import java.io.Serializable;
 import java.util.Objects;
 
 /**
  * A base class for options.
  */
-public abstract class AbstractOption implements Serializable {
+abstract class AbstractOption implements Serializable {
 
-  private static final long serialVersionUID = 201601261704L;
+  private static final long serialVersionUID = -5912727967831484228L;
   private final Object value;
-  private final DnsServiceRpc.Option rpcOption;
+  private final DnsRpc.Option rpcOption;
 
-  AbstractOption(DnsServiceRpc.Option rpcOption, Object value) {
+  AbstractOption(DnsRpc.Option rpcOption, Object value) {
     this.rpcOption = checkNotNull(rpcOption);
     this.value = value;
   }
@@ -42,7 +42,7 @@ Object value() {
     return value;
   }
 
-  DnsServiceRpc.Option rpcOption() {
+  DnsRpc.Option rpcOption() {
     return rpcOption;
   }
 
@@ -52,18 +52,19 @@ public boolean equals(Object obj) {
       return false;
     }
     AbstractOption other = (AbstractOption) obj;
-    return Objects.equals(value, other.value);
+    return Objects.equals(value, other.value) && Objects.equals(rpcOption, other.rpcOption);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(value);
+    return Objects.hash(value, rpcOption);
   }
 
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("value", value)
+        .add("rpcOption", rpcOption)
         .toString();
   }
 }