You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/15 23:07:28 UTC

[1/4] git commit: updated refs/heads/ui-vm-affinity to 1069610

Updated Branches:
  refs/heads/ui-vm-affinity bd8a9e920 -> 106961017


Fix command for executing injectkeys.sh

Signed-off-by: Hugo Trippaers <tr...@gmail.com>


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

Branch: refs/heads/ui-vm-affinity
Commit: 794e653c1325f6ba78b700f62e75c5a7b502c4eb
Parents: 1f76d8b
Author: Phong Nguyen <pn...@gilt.com>
Authored: Fri Apr 12 16:56:18 2013 -0400
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Mon Apr 15 20:43:02 2013 +0200

----------------------------------------------------------------------
 .../com/cloud/server/ConfigurationServerImpl.java  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/794e653c/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 596387f..404afec 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);


[3/4] git commit: updated refs/heads/ui-vm-affinity to 1069610

Posted by bf...@apache.org.
Detail view: CSS fixes for edit mode

-Fix scrollbars on select box

-Fix apply/cancel buttons being hidden


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

Branch: refs/heads/ui-vm-affinity
Commit: 4cc1097aa53eb6c351c1272b3c59be0ff7540337
Parents: 719f254
Author: Brian Federle <br...@citrix.com>
Authored: Mon Apr 15 14:06:42 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Apr 15 14:06:54 2013 -0700

----------------------------------------------------------------------
 ui/css/cloudstack3.css |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4cc1097a/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7ebda9b..2b6d497 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:;*/


[4/4] git commit: updated refs/heads/ui-vm-affinity to 1069610

Posted by bf...@apache.org.
Merge branch 'master' into ui-vm-affinity


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

Branch: refs/heads/ui-vm-affinity
Commit: 106961017478564ad8f9099d07075240c9a085e1
Parents: bd8a9e9 4cc1097
Author: Brian Federle <br...@citrix.com>
Authored: Mon Apr 15 14:07:19 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Apr 15 14:07:19 2013 -0700

----------------------------------------------------------------------
 docs/en-US/ipv6-support.xml                        |    4 ++--
 .../com/cloud/server/ConfigurationServerImpl.java  |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[2/4] git commit: updated refs/heads/ui-vm-affinity to 1069610

Posted by bf...@apache.org.
CLOUDSTACK-1997: added correct download location for the experimental system vm

Signed-off-by: Chip Childers <ch...@apache.org>


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

Branch: refs/heads/ui-vm-affinity
Commit: 719f254487e81c21216e8b8d8293f9e927713cea
Parents: 794e653
Author: Chip Childers <ch...@apache.org>
Authored: Mon Apr 15 16:05:26 2013 -0400
Committer: Chip Childers <ch...@apache.org>
Committed: Mon Apr 15 16:08:03 2013 -0400

----------------------------------------------------------------------
 docs/en-US/ipv6-support.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/719f2544/docs/en-US/ipv6-support.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/ipv6-support.xml b/docs/en-US/ipv6-support.xml
index 7367ec9..c7f7744 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