cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From frankzh...@apache.org
Subject git commit: updated refs/heads/4.2 to 12f36b8
Date Mon, 19 Aug 2013 22:02:50 GMT
Updated Branches:
  refs/heads/4.2 6f7fdac3e -> 12f36b8db


CLOUDSTACK-4370 - Upgrade failing due to depenency with cloudstack-agent, changed remove dependency
from cloud-agent to cloud-common


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

Branch: refs/heads/4.2
Commit: 12f36b8dbbfd0f24ca35280215bbd6e797e985d1
Parents: 6f7fdac
Author: rayeesn <rayeesn@citrix.com>
Authored: Mon Aug 19 07:25:39 2013 -0700
Committer: frank <frank.zhang@citrix.com>
Committed: Mon Aug 19 15:12:41 2013 -0700

----------------------------------------------------------------------
 packaging/centos63/cloud.spec | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12f36b8d/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 8cc6b48..5319fb6 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -104,6 +104,7 @@ Obsoletes: cloud-deps < 4.1.0
 Obsoletes: cloud-python < 4.1.0
 Obsoletes: cloud-setup < 4.1.0
 Obsoletes: cloud-cli < 4.1.0
+Obsoletes: cloud-daemonize < 4.1.0
 Group:   System Environment/Libraries
 %description common
 The Apache CloudStack files shared between agent and management server
@@ -128,7 +129,6 @@ Provides: cloud-agent
 Obsoletes: cloud-agent < 4.1.0
 Obsoletes: cloud-agent-libs < 4.1.0
 Obsoletes: cloud-test < 4.1.0
-Obsoletes: cloud-daemonize < 4.1.0
 Group: System Environment/Libraries
 %description agent
 The CloudStack agent for KVM hypervisors
@@ -414,13 +414,11 @@ if [ -f $oldserverxml ] || [ -L $oldserverxml ]; then
     if stat -c %N $oldserverxml| grep -q server-ssl ; then
         if [ -f $serverxml ] || [ -L $serverxml ]; then rm -f $serverxml; fi
         ln -s %{_sysconfdir}/%{name}/management/server-ssl.xml $serverxml
-        echo Please verify the server.xml in saved folder, and make the required changes
manually , saved folder available at
-        echo %{_sysconfdir}/%{name}/management
+        echo Please verify the server.xml in saved folder, and make the required changes
manually , saved folder available at $oldserverxml
     else
         if [ -f $serverxml ] || [ -L $serverxml ]; then rm -f $serverxml; fi
         ln -s %{_sysconfdir}/%{name}/management/server-nonssl.xml $serverxml
-        echo Please verify the server.xml in saved folder, and make the required changes
manually , saved folder available at
-        echo %{_sysconfdir}/%{name}/management
+        echo Please verify the server.xml in saved folder, and make the required changes
manually , saved folder available at $oldserverxml
 
     fi
 else
@@ -434,13 +432,11 @@ if [ -f $oldtomcatconf ] || [ -L $oldtomcatconf ] ; then
     if stat -c %N $oldtomcatconf| grep -q tomcat6-ssl ; then
         if [ -f $tomcatconf ] || [ -L $tomcatconf ]; then rm -f $tomcatconf; fi
         ln -s %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf $tomcatconf
-        echo Please verify the tomcat6.conf in saved folder, and make the required changes
manually , saved folder available at
-        echo %{_sysconfdir}/%{name}/management
+        echo Please verify the tomcat6.conf in saved folder, and make the required changes
manually , saved folder available at $oldtomcatconf
     else
         if [ -f $tomcatconf ] || [ -L $tomcatconf ]; then rm -f $tomcatconf; fi
         ln -s %{_sysconfdir}/%{name}/management/tomcat6-nonssl.conf $tomcatconf
-        echo Please verify the tomcat6.conf in saved folder, and make the required changes
manually , saved folder available at
-        echo %{_sysconfdir}/%{name}/management
+        echo Please verify the tomcat6.conf in saved folder, and make the required changes
manually , saved folder available at $oldtomcatconf
     fi
 else
     echo "Unable to determine ssl settings for tomcat.conf, please run cloudstack-setup-management
manually"


Mime
View raw message