You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/05/13 15:41:15 UTC
git commit: updated refs/heads/master to 7451f13
Repository: cloudstack
Updated Branches:
refs/heads/master 256e227cd -> 7451f13f9
debian: allow tomcat7 as optional dependency
This closes #247
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7451f13f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7451f13f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7451f13f
Branch: refs/heads/master
Commit: 7451f13f911e0044d0981046bcde31a18f77db83
Parents: 256e227
Author: Rene Moser <re...@apache.org>
Authored: Wed May 13 01:06:13 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 13 15:40:52 2015 +0200
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7451f13f/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 2d2c125..f6e9be0 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C
Package: cloudstack-management
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
+Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7 | tomcat8, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server