cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/planner_reserve to ebffe8f
Date Fri, 10 May 2013 00:49:37 GMT
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 <prachi@cloud.com>
Authored: Thu May 9 17:49:01 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
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.*;


Mime
View raw message