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 4EA44F8D5 for ; Fri, 10 May 2013 00:49:38 +0000 (UTC) Received: (qmail 80831 invoked by uid 500); 10 May 2013 00:49:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 80811 invoked by uid 500); 10 May 2013 00:49:38 -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 80803 invoked by uid 99); 10 May 2013 00:49:38 -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, 10 May 2013 00:49:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DEA7A88AEB6; Fri, 10 May 2013 00:49:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prachidamle@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/planner_reserve to ebffe8f Date: Fri, 10 May 2013 00:49:37 +0000 (UTC) Updated Branches: refs/heads/planner_reserve 55eabcff2 -> ebffe8f94 Fixing build issue after merge with master Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebffe8f9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebffe8f9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebffe8f9 Branch: refs/heads/planner_reserve Commit: ebffe8f943c68c2ed12587897047baa9e0e15b86 Parents: 55eabcf Author: Prachi Damle Authored: Thu May 9 17:49:01 2013 -0700 Committer: Prachi Damle Committed: Thu May 9 17:49:01 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/server/ManagementServerImpl.java | 1 + .../vm/DeploymentPlanningManagerImplTest.java | 16 +++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebffe8f9/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 1068cf6..e383181 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -455,6 +455,7 @@ import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.PodVlanMapDao; import com.cloud.dc.dao.VlanDao; import com.cloud.deploy.DataCenterDeployment; +import com.cloud.deploy.DeploymentPlanner; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebffe8f9/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java index 2e055c8..e3b7d31 100644 --- a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java +++ b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java @@ -1,3 +1,19 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.vm; import static org.junit.Assert.*;