cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject [6/6] git commit: updated refs/heads/4.3 to 9565f4a
Date Fri, 15 Nov 2013 09:11:35 GMT
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 <milamber@apache.org>
Authored: Fri Nov 15 09:11:06 2013 +0000
Committer: Milamber <milamber@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(-)
----------------------------------------------------------------------



Mime
View raw message