cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [08/52] git commit: updated refs/heads/saml2 to 1d809ff
Date Mon, 25 Aug 2014 15:36:04 GMT
CLOUDSTACK-7405: Make the trailing slash conditional for meta-data requests

This should fix the cloud-init issues described in this issue.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14999728
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14999728
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14999728

Branch: refs/heads/saml2
Commit: 1499972804b6de4fade5c84436e29f9904165e18
Parents: 433ec7c
Author: Wido den Hollander <wido@widodh.nl>
Authored: Mon Aug 25 14:13:09 2014 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Mon Aug 25 14:13:09 2014 +0200

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/vmdata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14999728/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
index f508032..a44c134 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
@@ -176,7 +176,7 @@ def htaccess(ip, folder, file):
         if not entry in fh.read():
             fh.write(entry + '\n')
 
-        entry = "RewriteRule ^meta-data/$  ../" + folder + "/%{REMOTE_ADDR}/meta-data [L,NC,QSA]"
+        entry = "RewriteRule ^meta-data/?$  ../" + folder + "/%{REMOTE_ADDR}/meta-data [L,NC,QSA]"
 
         fh.seek(0)
         if not entry in fh.read():


Mime
View raw message