Merge remote branch 'upstream/master'

Conflicts:
	blobstore/src/test/clojure/org/jclouds/blobstore_test.clj
This commit is contained in:
David Santiago 2011-04-04 19:04:46 -05:00
commit 1239e1a7c9
1 changed files with 1 additions and 1 deletions

View File

@ -24,6 +24,6 @@ import java.util.concurrent.TimeUnit;
import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStore;
import org.jclouds.concurrent.Timeout; import org.jclouds.concurrent.Timeout;
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) interface TransientBlobStore extends BlobStore { @Timeout(duration = 2, timeUnit = TimeUnit.MINUTES) interface TransientBlobStore extends BlobStore {
} }