Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF41410F4D for ; Fri, 15 Nov 2013 09:12:42 +0000 (UTC) Received: (qmail 40869 invoked by uid 500); 15 Nov 2013 09:11:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 40780 invoked by uid 500); 15 Nov 2013 09:11:45 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 40550 invoked by uid 99); 15 Nov 2013 09:11:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Nov 2013 09:11:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4055882E552; Fri, 15 Nov 2013 09:11:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: milamber@apache.org To: commits@cloudstack.apache.org Date: Fri, 15 Nov 2013 09:11:35 -0000 Message-Id: <31c16ca93bd0424e8669db12e29cb840@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Fri Nov 15 09:11:06 2013 +0000 Committer: Milamber 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(-) ----------------------------------------------------------------------