---

mziccard · mziccard · commit 030178b7284b · 2015-09-24T12:21:33.000+02:00
yaml --- r: 6137 b: refs/heads/tswast-patch-1 c: 929030d h: refs/heads/master i: 6135: abfecc0
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 4a0862d9fccb0223e7bff7709240874bca9c9a0a
+refs/heads/tswast-patch-1: 929030d89b1d40036b1ec906d16505b02a830df7
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java
@@ -282,7 +282,6 @@ private Storage.Objects.Delete deleteRequest(StorageObject blob, Map<Option, ?>
         .setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))
         .setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))
         .setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))
-        .setIfGenerationMatch(100L)
         .setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options));
   }
 
diff --git a/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/HttpMethod.java b/branches/tswast-patch-1/gcloud-java-storage/src/main/java/com/google/gcloud/storage/HttpMethod.java
@@ -20,5 +20,5 @@
  * Http method supported by Storage service.
  */
 public enum HttpMethod {
-  GET, HEAD, PUT, POST, DELETE, OPTIONS
+  GET, HEAD, PUT, POST, DELETE
 }

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,6 @@ private Storage.Objects.Delete deleteRequest(StorageObject blob, Map<Option, ?>`
`282`	`282`	`.setIfMetagenerationMatch(IF_METAGENERATION_MATCH.getLong(options))`
`283`	`283`	`.setIfMetagenerationNotMatch(IF_METAGENERATION_NOT_MATCH.getLong(options))`
`284`	`284`	`.setIfGenerationMatch(IF_GENERATION_MATCH.getLong(options))`
`285`		`- .setIfGenerationMatch(100L)`
`286`	`285`	`.setIfGenerationNotMatch(IF_GENERATION_NOT_MATCH.getLong(options));`
`287`	`286`	`}`
`288`	`287`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`* Http method supported by Storage service.`
`21`	`21`	`*/`
`22`	`22`	`public enum HttpMethod {`
`23`		`- GET, HEAD, PUT, POST, DELETE, OPTIONS`
	`23`	`+ GET, HEAD, PUT, POST, DELETE`
`24`	`24`	`}`