Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-9172 Added cross zones check to delete template and iso Check the existence of 'forceencap' parameter before use systemvm: set default umask 022 in injectkeys.sh
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2fc0c4c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2fc0c4c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2fc0c4c Branch: refs/heads/4.8 Commit: c2fc0c4cd3573ea6491ca9dd8b19d9c56c1a5ea0 Parents: 59ac07e d13ff88 Author: Will Stevens <[email protected]> Authored: Thu Apr 21 16:31:49 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Thu Apr 21 16:31:49 2016 -0400 ---------------------------------------------------------------------- packaging/centos63/cloud-management.rc | 1 + packaging/centos7/cloud-management.service | 1 + scripts/vm/systemvm/injectkeys.sh | 2 +- .../debian/config/opt/cloud/bin/configure.py | 2 ++ ui/scripts/templates.js | 16 ++++++++++------ 5 files changed, 15 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
