You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/02/05 12:48:04 UTC

[1/2] incubator-brooklyn git commit: Remove Softlayer API key

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 41b2805a8 -> 4b1b5bdcc


Remove Softlayer API key


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8c9eafa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8c9eafa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8c9eafa6

Branch: refs/heads/master
Commit: 8c9eafa656232225aa26fbf547b88810bd51bb6b
Parents: 41b2805
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Feb 5 13:31:10 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Feb 5 13:31:10 2015 +0200

----------------------------------------------------------------------
 .../entity/rebind/persister/jclouds/BlobStoreExpiryTest.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8c9eafa6/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
index 021757e..58eb2c3 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
@@ -205,8 +205,7 @@ public class BlobStoreExpiryTest {
             .add("X-Auth-New-Token", "" + true)
             .add("X-Auth-Token-Lifetime", "" + expiration.toSeconds())
             );
-//        curl -v https://ams01.objectstorage.softlayer.net/auth/v1.0/v1.0 -H "X-Auth-User: IBMOS321366-2:cloudsoft" -H "X-Auth-Key: 06cef1beff5432cc9453934e06beb85de5f0a53a2340d7e0cd4a4705655e8132" -H "Host: ams01.objectstorage.softlayer.net" -H "X-Auth-New-Token: true" -H "X-Auth-Token-Lifetime: 15"
-//            -H "Host: ams01.objectstorage.softlayer.net" -H "X-Auth-New-Token: true" -H "X-Auth-Token-Lifetime: 15"
+//        curl -v https://ams01.objectstorage.softlayer.net/auth/v1.0/v1.0 -H "X-Auth-User: IBMOS12345-2:username" -H "X-Auth-Key: <API KEY>" -H "Host: ams01.objectstorage.softlayer.net" -H "X-Auth-New-Token: true" -H "X-Auth-Token-Lifetime: 15"
         log.info("Requested token with explicit lifetime: "+expiration+" at "+url+"\n"+response+"\n"+response.getHeaderLists());
         return response;
     }


[2/2] incubator-brooklyn git commit: This closes #505

Posted by he...@apache.org.
This closes #505


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4b1b5bdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4b1b5bdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4b1b5bdc

Branch: refs/heads/master
Commit: 4b1b5bdcc266d34855e0c97a2e6aec74f2590d52
Parents: 41b2805 8c9eafa
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Feb 5 11:47:55 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Feb 5 11:47:55 2015 +0000

----------------------------------------------------------------------
 .../entity/rebind/persister/jclouds/BlobStoreExpiryTest.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------