Merge branch 'hotfix/4.3/6892' into 4.3
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d48f9f2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d48f9f2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d48f9f2 Branch: refs/heads/4.3 Commit: 4d48f9f238f53147ca703f3fbd4ac647e892b9df Parents: e4ae5b2 907d39f Author: Sebastien Goasguen <[email protected]> Authored: Wed Aug 20 08:46:52 2014 -0400 Committer: Sebastien Goasguen <[email protected]> Committed: Wed Aug 20 08:46:52 2014 -0400 ---------------------------------------------------------------------- client/tomcatconf/catalina.properties.in | 2 +- packaging/centos63/cloud.spec | 36 +++++++++++++++++++++++++-- packaging/centos63/package.sh | 7 +++++- 3 files changed, 41 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
