You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/06/21 02:51:55 UTC
[1/2] git commit: updated refs/heads/master to 5456d0d
Updated Branches:
refs/heads/master 09f50ca50 -> 5456d0d85
CLOUDSTACK-2947: fix create template from snapshot, in case of mix zone-wide/cluster wide primary storage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b9ea176
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b9ea176
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b9ea176
Branch: refs/heads/master
Commit: 6b9ea1761a0f8776e6f6cc973bbe7cfa002ce514
Parents: 09f50ca
Author: Edison Su <su...@gmail.com>
Authored: Thu Jun 20 16:53:15 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Jun 20 17:51:11 2013 -0700
----------------------------------------------------------------------
client/tomcatconf/log4j-cloud.xml.in | 4 ++++
server/src/com/cloud/storage/StorageManagerImpl.java | 12 +++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b9ea176/client/tomcatconf/log4j-cloud.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in
index fc1c29e..503ba8e 100755
--- a/client/tomcatconf/log4j-cloud.xml.in
+++ b/client/tomcatconf/log4j-cloud.xml.in
@@ -123,6 +123,10 @@ under the License.
<priority value="DEBUG"/>
</category>
+ <category name="org.apache.cloudstack">
+ <priority value="DEBUG"/>
+ </category>
+
<category name="com.cloud.utils.nio">
<priority value="INFO"/>
</category>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b9ea176/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 0df3dbe..b3e8b96 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -361,9 +361,15 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
if (pool.getStatus() != StoragePoolStatus.Up) {
continue;
}
- ClusterVO cluster = _clusterDao.findById(pool.getClusterId());
- if (type == cluster.getHypervisorType()) {
- retPools.add(pool);
+ if (pool.getScope() == ScopeType.ZONE) {
+ if (pool.getHypervisor() != null && pool.getHypervisor() == type) {
+ retPools.add(pool);
+ }
+ } else {
+ ClusterVO cluster = _clusterDao.findById(pool.getClusterId());
+ if (type == cluster.getHypervisorType()) {
+ retPools.add(pool);
+ }
}
}
Collections.shuffle(retPools);
[2/2] git commit: updated refs/heads/master to 5456d0d
Posted by ed...@apache.org.
CLOUDSTACK-2481: add vhd-util in system vm template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5456d0d8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5456d0d8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5456d0d8
Branch: refs/heads/master
Commit: 5456d0d85e6a77910ae188a3ba0b8063d17188e5
Parents: 6b9ea17
Author: Edison Su <su...@gmail.com>
Authored: Thu Jun 20 17:49:39 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Jun 20 17:51:38 2013 -0700
----------------------------------------------------------------------
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5456d0d8/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 203cf54..2a8a75b 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -164,12 +164,17 @@ EOF
locale-gen en_US.UTF-8
}
+fix_vhdutil() {
+ wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
+}
+
do_fixes() {
fix_nameserver
fix_inittab
fix_acpid
fix_hostname
fix_locale
+ fix_vhdutil
}
configure_apache2() {