cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to e2ca6e3
Date Tue, 07 Oct 2014 20:30:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f4326aec8 -> e2ca6e38d


Revert "CLOUDSTACK-7671: Management server restart failed after reboot"

This reverts commit e8f1c592120707ac214d535a6637fa7dc5826289.


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

Branch: refs/heads/master
Commit: e2ca6e38d5e850d820fa0ebfacb7dca9f1f06095
Parents: f4326ae
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Tue Oct 7 13:28:25 2014 -0700
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Tue Oct 7 13:30:40 2014 -0700

----------------------------------------------------------------------
 packaging/centos63/cloud.spec                     |  2 --
 packaging/centos63/default/macros.spec            |  4 +---
 .../centos63/rhel7/cloudstack-management.conf     | 18 ------------------
 packaging/centos63/rhel7/macros.spec              |  4 +---
 4 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2ca6e38/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index c1f185d..7306d1f 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -273,7 +273,6 @@ install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%
 install -D client/target/utilities/bin/cloud-setup-baremetal ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-baremetal
 install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm
 install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses
-%{_cloudstackmanagementconf}
 
 cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup
 cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client
@@ -629,7 +628,6 @@ fi
 %{_defaultdocdir}/%{name}-management-%{version}/LICENSE
 %{_defaultdocdir}/%{name}-management-%{version}/NOTICE
 %attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out
-%{_cloudstackmanagementconfattr}
 
 %files agent
 %attr(0755,root,root) %{_bindir}/%{name}-setup-agent

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2ca6e38/packaging/centos63/default/macros.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/default/macros.spec b/packaging/centos63/default/macros.spec
index 0e66187..f3c937c 100644
--- a/packaging/centos63/default/macros.spec
+++ b/packaging/centos63/default/macros.spec
@@ -24,6 +24,4 @@
 %define _managementservice %{nil}
 %define _managementserviceattribute %{nil}
 %define _iptablesservice %{nil}
-%define _serverxmlname server
-%define _cloudstackmanagementconf %{nil}
-%define _cloudstackmanagementconfattr %{nil}
\ No newline at end of file
+%define _serverxmlname server
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2ca6e38/packaging/centos63/rhel7/cloudstack-management.conf
----------------------------------------------------------------------
diff --git a/packaging/centos63/rhel7/cloudstack-management.conf b/packaging/centos63/rhel7/cloudstack-management.conf
deleted file mode 100644
index 881af1a..0000000
--- a/packaging/centos63/rhel7/cloudstack-management.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-f /var/run/cloudstack-management.pid 0644 cloud cloud -
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2ca6e38/packaging/centos63/rhel7/macros.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec
index 13eaf8e..4b71092 100644
--- a/packaging/centos63/rhel7/macros.spec
+++ b/packaging/centos63/rhel7/macros.spec
@@ -24,6 +24,4 @@
 %define _managementservice install -D packaging/centos63/%{_os}/cloud-management.service
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-management.service
 %define _managementserviceattribute %attr(0755,root,root) %{_unitdir}/%{name}-management.service
 %define _iptablesservice Requires: iptables-services
-%define _serverxmlname server7
-%define _cloudstackmanagementconf install -D packaging/centos63/%{_os}/%{name}-management.conf
${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}-management.conf
-%define _cloudstackmanagementconfattr %attr(0755,root,root) %{_tmpfilesdir}/%{name}-management.conf
\ No newline at end of file
+%define _serverxmlname server7
\ No newline at end of file


Mime
View raw message