Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging issues

This commit is contained in:
Jeremy Daggett 2011-12-18 20:37:44 -08:00
parent c8ca287303 86217ed60c
commit fb9739f615
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java
View File

@ -88,7 +88,6 @@ public class ContainerMetadata implements Comparable<ContainerMetadata> {
return metadata; return metadata;
} }
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;

1
providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/reference/HPCloudObjectStorageHeaders.java
View File

@ -36,4 +36,5 @@ public interface HPCloudObjectStorageHeaders extends SwiftHeaders {
public static final String CDN_TTL = "X-Ttl"; public static final String CDN_TTL = "X-Ttl";
public static final String CDN_URI = "X-Cdn-Uri"; public static final String CDN_URI = "X-Cdn-Uri";
public static final String CDN_USER_AGENT_ACL = "X-User-Agent-ACL"; public static final String CDN_USER_AGENT_ACL = "X-User-Agent-ACL";
} }

3
providers/hpcloud-object-storage/src/test/java/org/jclouds/hpcloud/object/storage/HPCloudObjectStorageClientLiveTest.java
View File

@ -44,7 +44,7 @@ public class HPCloudObjectStorageClientLiveTest extends CommonSwiftClientLiveTes
@Override @Override
protected void testGetObjectContentType(SwiftObject getBlob) { protected void testGetObjectContentType(SwiftObject getBlob) {
assertEquals(getBlob.getInfo().getContentType(), "application/x-www-form-urlencoded"); assertEquals(getBlob.getInfo().getContentType(), "application/unknown");
} }
@Test @Test
@ -111,6 +111,7 @@ public class HPCloudObjectStorageClientLiveTest extends CommonSwiftClientLiveTes
} }
})); }));
*/ */
cdnMetadataList = getApi().listCDNContainers( cdnMetadataList = getApi().listCDNContainers(
ListCDNContainerOptions.Builder.afterMarker( ListCDNContainerOptions.Builder.afterMarker(
containerNameWithCDN.substring(0, containerNameWithCDN.length() - 1)).maxResults(1)); containerNameWithCDN.substring(0, containerNameWithCDN.length() - 1)).maxResults(1));

1
providers/pom.xml
View File

@ -67,7 +67,6 @@
<module>go2cloud-jhb1</module> <module>go2cloud-jhb1</module>
<module>softlayer</module> <module>softlayer</module>
<module>ninefold-compute</module> <module>ninefold-compute</module>
<!--<module>hpcloud-compute</module>-->
<module>hpcloud-object-storage</module> <module>hpcloud-object-storage</module>
</modules> </modules>
</project> </project>