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

Merge branch '1.5.x' of github.com:jclouds/jclouds into 1.5.x

This commit is contained in:
Ignasi Barrera 2013-03-18 19:22:37 +01:00
parent 27ee3f263b b4093e1f20
commit e4f41320e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
View File

@ -86,7 +86,7 @@ public class NovaApiMetadata extends BaseRestApiMetadata {
// Keystone 1.1 expires tokens after 24 hours and allows renewal 1 hour
// before expiry by default. We choose a value less than the latter
// since the former persists between jclouds invocations.
properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 * 60 + "");
properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 + "");
return properties;
}

2
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
View File

@ -71,7 +71,7 @@ public class SwiftApiMetadata extends BaseRestApiMetadata {
// Keystone 1.1 expires tokens after 24 hours and allows renewal 1 hour
// before expiry by default. We choose a value less than the latter
// since the former persists between jclouds invocations.
properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 * 60 + "");
properties.setProperty(PROPERTY_SESSION_INTERVAL, 30 * 60 + "");
return properties;
}