You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2013/11/15 10:11:35 UTC
[6/6] git commit: updated refs/heads/4.3 to 9565f4a
Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack 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/9565f4ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9565f4ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9565f4ac
Branch: refs/heads/4.3
Commit: 9565f4ac3389f5bc0f7b939afc26cba2b8c5529c
Parents: ae5cd0f 52de0dc
Author: Milamber <mi...@apache.org>
Authored: Fri Nov 15 09:11:06 2013 +0000
Committer: Milamber <mi...@apache.org>
Committed: Fri Nov 15 09:11:06 2013 +0000
----------------------------------------------------------------------
.../cloud/deploy/DeploymentClusterPlanner.java | 10 +++++++++
.../framework/config/ConfigDepot.java | 4 ++++
.../framework/config/impl/ConfigDepotImpl.java | 17 ++++++++++++++-
.../com/cloud/capacity/CapacityManagerImpl.java | 2 +-
server/src/com/cloud/configuration/Config.java | 2 --
.../configuration/ConfigurationManagerImpl.java | 22 ++++++++++++++++----
.../src/com/cloud/deploy/FirstFitPlanner.java | 22 +++++++++++++++-----
.../VirtualNetworkApplianceManagerImpl.java | 13 +++++++++++-
.../cloud/server/ConfigurationServerImpl.java | 5 +++--
.../networkoffering/ChildTestConfiguration.java | 6 ++++++
10 files changed, 87 insertions(+), 16 deletions(-)
----------------------------------------------------------------------