cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 52a0ada
Date Wed, 29 Apr 2015 14:49:40 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7b1059175 -> 52a0adad0


CLOUDSTACK-8402: EL7 rpms should depend on openjdk7

Depend on java-1.7.0-openjdk for EL7 rpms as agent fails with openjdk8. This
fix needs to be reverted/removed to use openjdk8 once we start supporting it.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: 52a0adad04d67555a50ab58662735039f438c7e0
Parents: 7b10591
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Wed Apr 29 16:46:53 2015 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Wed Apr 29 16:49:25 2015 +0200

----------------------------------------------------------------------
 packaging/centos7/cloud.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/52a0adad/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index ce1b6b8..2037cf1 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
 %package management
 Summary:   CloudStack management server UI
 Requires: tomcat => 7.0
-Requires: java => 1.7.0
+Requires: java-1.7.0-openjdk
 Requires: python
 Requires: bash
 Requires: bzip2
@@ -99,7 +99,7 @@ The Apache CloudStack files shared between agent and management server
 %package agent
 Summary: CloudStack Agent for KVM hypervisors
 Requires: openssh-clients
-Requires: java => 1.7.0
+Requires: java-1.7.0-openjdk
 Requires: %{name}-common = %{_ver}
 Requires: libvirt
 Requires: bridge-utils
@@ -134,7 +134,7 @@ The CloudStack baremetal agent
 
 %package usage
 Summary: CloudStack Usage calculation server
-Requires: java => 1.7.0
+Requires: java-1.7.0-openjdk
 Requires: jsvc
 Requires: jakarta-commons-daemon
 Requires: jakarta-commons-daemon-jsvc


Mime
View raw message