---

mziccard · mziccard · commit 5cad5ce853ed · 2016-03-03T00:32:08.000+01:00
yaml --- r: 1743 b: refs/heads/master c: 3600338 h: refs/heads/master i: 1741: e784573 1739: 59ab6e9 1735: 557a5f3 1727: 7ffb4e4
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a3fdbbc697b5923848f6d3609b82232994a2433f
+refs/heads/master: 36003385f3fb321a52af6533374fa7b3489b1ec7
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
diff --git a/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -207,17 +207,17 @@ public static BlobTargetOption generationNotMatch(long generation) {
 
     /**
      * Returns an option for blob's metageneration match. If this option is used the request will
-     * fail if metageneration does not match the provided value. Either this option or
-     * {@link #metagenerationNotMatch(long)} can be provided at the same time.
+     * fail if metageneration does not match the provided value. This option can not be provided
+     * together with {@link #metagenerationNotMatch(long)}.
      */
     public static BlobTargetOption metagenerationMatch(long metageneration) {
       return new BlobTargetOption(StorageRpc.Option.IF_METAGENERATION_MATCH, metageneration);
     }
 
     /**
      * Returns an option for blob's metageneration mismatch. If this option is used the request will
-     * fail if metageneration matches the provided value. Either this option or
-     * {@link #metagenerationMatch(long)} can be provided at the same time.
+     * fail if metageneration matches the provided value. This option can not be provided together
+     * with {@link #metagenerationMatch(long)}.
      */
     public static BlobTargetOption metagenerationNotMatch(long metageneration) {
       return new BlobTargetOption(StorageRpc.Option.IF_METAGENERATION_NOT_MATCH, metageneration);
@@ -353,8 +353,8 @@ public static BlobWriteOption generationNotMatch(long generation) {
 
     /**
      * Returns an option for blob's metageneration match. If this option is used the request will
-     * fail if metageneration does not match the provided value. Either this option or
-     * {@link #metagenerationNotMatch(long)} can be provided at the same time.
+     * fail if metageneration does not match the provided value. This option can not be provided
+     * together with {@link #metagenerationNotMatch(long)}.
      */
     public static BlobWriteOption metagenerationMatch(long metageneration) {
       return new BlobWriteOption(Storage.BlobWriteOption.Option.IF_METAGENERATION_MATCH,
@@ -363,8 +363,8 @@ public static BlobWriteOption metagenerationMatch(long metageneration) {
 
     /**
      * Returns an option for blob's metageneration mismatch. If this option is used the request will
-     * fail if metageneration matches the provided value. Either this option or
-     * {@link #metagenerationMatch(long)} can be provided at the same time.
+     * fail if metageneration matches the provided value. This option can not be provided together
+     * with {@link #metagenerationMatch(long)}.
      */
     public static BlobWriteOption metagenerationNotMatch(long metageneration) {
       return new BlobWriteOption(Storage.BlobWriteOption.Option.IF_METAGENERATION_NOT_MATCH,
