Merge branch '4.5'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7fd1e8e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fd1e8e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fd1e8e2 Branch: refs/heads/master Commit: 7fd1e8e239cc9a1080dc861a053786b218e37c93 Parents: cfe5a6f 7e6ec2c Author: Jayapal <[email protected]> Authored: Fri Nov 14 12:12:07 2014 +0530 Committer: Jayapal <[email protected]> Committed: Fri Nov 14 12:12:07 2014 +0530 ---------------------------------------------------------------------- .../configuration/ConfigurationManagerImpl.java | 107 +++++++++---------- 1 file changed, 52 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fd1e8e2/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ----------------------------------------------------------------------
