You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/03/15 05:22:44 UTC
[1/2] git commit: updated refs/heads/4.9 to 929c823
Repository: cloudstack
Updated Branches:
refs/heads/4.9 7b719c71f -> 929c8231c
CLOUDSTACK-9765: centos: packaging: fix missing path in spec file post install
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bcc6b4fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bcc6b4fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bcc6b4fb
Branch: refs/heads/4.9
Commit: bcc6b4fbaf74865b971a72122d15d5bfde4ab7ba
Parents: 8b6e96b
Author: Rene Moser <re...@apache.org>
Authored: Tue Jan 31 18:15:12 2017 +0100
Committer: Rene Moser <re...@apache.org>
Committed: Thu Feb 2 15:56:55 2017 +0100
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 2 +-
packaging/centos7/cloud.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcc6b4fb/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 9556236..87a60c3 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -440,7 +440,7 @@ if [ "$1" == "1" ] ; then
fi
grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" db.properties
+grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcc6b4fb/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 7c093f9..74f60e7 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -397,7 +397,7 @@ if [ "$1" == "1" ] ; then
fi
grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
-grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" db.properties
+grep -s -q "db.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.usage.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.simulator.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
[2/2] git commit: updated refs/heads/4.9 to 929c823
Posted by ra...@apache.org.
Merge pull request #1923 from resmo/fix/centos-spec-upgrade-db-properties
CLOUDSTACK-9765: centos: packaging: fix missing path in spec fileRelated to 6051fa503a2da7b96256f21e6b7c42aa1f3cb01e
/cc @rhtyd (shapeblue)
* pr/1923:
CLOUDSTACK-9765: centos: packaging: fix missing path in spec file post install
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/929c8231
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/929c8231
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/929c8231
Branch: refs/heads/4.9
Commit: 929c8231c5e7f2e96970cbb8fda277c90dbbc6c9
Parents: 7b719c7 bcc6b4f
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Wed Mar 15 10:51:36 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Wed Mar 15 10:51:36 2017 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 2 +-
packaging/centos7/cloud.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------