From 794e653c1325f6ba78b700f62e75c5a7b502c4eb Mon Sep 17 00:00:00 2001
From: Phong Nguyen <pnguyen@gilt.com>
Date: Fri, 12 Apr 2013 16:56:18 -0400
Subject: [PATCH 1/3] Fix command for executing injectkeys.sh

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
---
 server/src/com/cloud/server/ConfigurationServerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 596387f100e..404afecf2cd 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -729,7 +729,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
         if (systemVmIsoPath == null) {
             throw new CloudRuntimeException("Unable to find systemvm iso vms/systemvm.iso");
         }
-        final Script command = new Script("/bin/bash " + scriptPath, s_logger);
+        final Script command = new Script("/bin/bash", s_logger);
+        command.add(scriptPath);
         command.add(publicKeyPath);
         command.add(privKeyPath);
         command.add(systemVmIsoPath);

From 719f254487e81c21216e8b8d8293f9e927713cea Mon Sep 17 00:00:00 2001
From: Chip Childers <chipchilders@apache.org>
Date: Mon, 15 Apr 2013 16:05:26 -0400
Subject: [PATCH 2/3] CLOUDSTACK-1997: added correct download location for the
 experimental system vm

Signed-off-by: Chip Childers <chipchilders@apache.org>
---
 docs/en-US/ipv6-support.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en-US/ipv6-support.xml b/docs/en-US/ipv6-support.xml
index 7367ec9ad80..c7f7744393e 100644
--- a/docs/en-US/ipv6-support.xml
+++ b/docs/en-US/ipv6-support.xml
@@ -75,8 +75,8 @@
       </listitem>
       <listitem>
         <para>Use the System VM template exclusively designed to support IPv6. Download the System
-          VM template from <ulink url="http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/"
-            >http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/</ulink>.</para>
+          VM template from <ulink url="http://cloudstack.apt-get.eu/systemvm/"
+            >http://cloudstack.apt-get.eu/systemvm/</ulink>.</para>
       </listitem>
       <listitem>
         <para>The concept of Default Network applies to IPv6 networks. However, unlike IPv4

From 4cc1097aa53eb6c351c1272b3c59be0ff7540337 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 15 Apr 2013 14:06:42 -0700
Subject: [PATCH 3/3] Detail view: CSS fixes for edit mode

-Fix scrollbars on select box

-Fix apply/cancel buttons being hidden
---
 ui/css/cloudstack3.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7ebda9b8f36..2b6d4976001 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1697,7 +1697,7 @@ div.list-view td.state.off span {
 }
 
 .detail-view .main-groups {
-  max-height: 455px;
+  max-height: 407px;
   overflow: auto;
   overflow-x: hidden;
   margin-right: 12px;
@@ -1754,6 +1754,10 @@ div.list-view td.state.off span {
   width: 245px;
 }
 
+.detail-group .main-groups table td.value > span select {
+  width: 100% !important;
+}
+
 .detail-group .main-groups table td.value .view-all {
   cursor: pointer;
   /*[empty]height:;*/