You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/08/31 22:21:30 UTC
[1/2] git commit: updated refs/heads/4.4 to 83d2fd4
Repository: cloudstack
Updated Branches:
refs/heads/4.4 781a8f5c3 -> 83d2fd45c
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/4f494f70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f494f70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f494f70
Branch: refs/heads/4.4
Commit: 4f494f708b78dc1e5fd239d5746c42f2cebc8396
Parents: 8138984
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Aug 25 14:13:09 2014 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Aug 25 14:31:58 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/4f494f70/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():
[2/2] git commit: updated refs/heads/4.4 to 83d2fd4
Posted by da...@apache.org.
Merge remote-tracking branch 'origin/hotfix/4.4-7405' into 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83d2fd45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83d2fd45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83d2fd45
Branch: refs/heads/4.4
Commit: 83d2fd45c52190accf858c99e3eb21d02892129e
Parents: 781a8f5 4f494f7
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Aug 31 22:21:09 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Aug 31 22:21:09 2014 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/vmdata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------