Merge commit '9c8be49b56d5e04c7c48309f65d5f91972f9e47f' into HEAD

eucalyptus · Jan 12, 2017 · 336c350 · 336c350
2 parents cc3f13e + 9c8be49
commit 336c350
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...rage/src/test/java/com/eucalyptus/objectstorage/pipeline/auth/S3V4AuthenticationTest.java b/...rage/src/test/java/com/eucalyptus/objectstorage/pipeline/auth/S3V4AuthenticationTest.java
@@ -33,7 +33,7 @@ public class S3V4AuthenticationTest {
       "X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIOSFODNN7EXAMPLE%2F20130524%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date" +
       "=20130524T000000Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host\n" + "host:examplebucket.s3.amazonaws.com\n" + "\n" + "host\n" +
       "UNSIGNED-PAYLOAD";
-  static String CANONICAL_HEADERS_REQUEST = "PUT\n" + "/test%24file.text\n" + "\n" + "date:Fri, 24 May 2013 00:00:00 GMT\n" +
+  static String CANONICAL_HEADERS_REQUEST = "PUT\n" + "/test$file.text\n" + "\n" + "date:Fri, 24 May 2013 00:00:00 GMT\n" +
       "host:examplebucket.s3.amazonaws.com\n" + "x-amz-content-sha256:44ce7dd67c959e0d3524ffac1771dfbba87d2b6b4b4e99e42034a8b803f8b072\n"
       + "x-amz-date:20130524T000000Z\n" + "x-amz-storage-class:REDUCED_REDUNDANCY\n\n" + "date;host;x-amz-content-sha256;x-amz-date;" +
       "x-amz-storage-class\n" + "44ce7dd67c959e0d3524ffac1771dfbba87d2b6b4b4e99e42034a8b803f8b072";

diff --git a/util/sensor.c b/util/sensor.c
@@ -1083,7 +1083,7 @@ static sensorResource *find_or_alloc_sr(const boolean do_alloc, const char *reso
             euca_strncpy(unused_sr->resourceUuid, resourceUuid, sizeof(unused_sr->resourceUuid));
         unused_sr->timestamp = time(NULL);
         sensor_state->used_resources++;
-        LOGINFO("allocated new sensor resource %s\n", resourceName);
+        LOGINFO("allocated new sensor resource %s UUID: %s\n", resourceName, (resourceUuid == NULL) ? "NULL" : resourceUuid);
     }
 
     return unused_sr;