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

Merge remote-tracking branch 'keg/master' 

Conflicts:
	common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/config/AuthenticationServiceModule.java
	common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestClientExpectTest.java
This commit is contained in:
Jeremy Daggett 2012-02-02 15:06:39 -08:00
parent 50cf37f722 bf58be7a6d
commit d57fb93211
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/openstack/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestClientExpectTest.java
View File

@ -70,7 +70,6 @@ public class BaseKeystoneRestClientExpectTest<S> extends BaseRestClientExpectTes
credential = secretKey; credential = secretKey;
} }
protected String authToken = "Auth_4f173437e4b013bee56d1007"; protected String authToken = "Auth_4f173437e4b013bee56d1007";
protected HttpResponse responseWithAccess = HttpResponse.builder().statusCode(200).message("HTTP/1.1 200").payload( protected HttpResponse responseWithAccess = HttpResponse.builder().statusCode(200).message("HTTP/1.1 200").payload(