mirror of https://github.com/apache/jclouds.git
Merge remote branch 'upstream/master'
Conflicts: blobstore/src/test/clojure/org/jclouds/blobstore_test.clj
This commit is contained in:
commit
1239e1a7c9
|
@ -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 {
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue