You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/10/28 07:00:17 UTC
[1/2] git commit: updated refs/heads/master to b4ceefa
Updated Branches:
refs/heads/master 858ce7666 -> b4ceefa46
spring-modularization: remove simulator planner
The simulator uses the default planners of cloudstack and does not
require a separate planner context (as of now). This was just c&p from
baremetal planners.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4fb5f55
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4fb5f55
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4fb5f55
Branch: refs/heads/master
Commit: f4fb5f5582569ea30a0004587a3f340193caf47a
Parents: 858ce76
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Oct 25 11:18:31 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Oct 28 11:29:01 2013 +0530
----------------------------------------------------------------------
.../simulator-planner/module.properties | 18 -----------
.../simulator-planner/spring-context.xml | 34 --------------------
2 files changed, 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4fb5f55/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties b/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties
deleted file mode 100644
index 055be73..0000000
--- a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/module.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-name=simulator-planner
-parent=planner
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4fb5f55/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml b/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml
deleted file mode 100644
index 8c14c3e..0000000
--- a/plugins/hypervisors/simulator/resources/META-INF/cloudstack/simulator-planner/spring-context.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
- 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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd"
- >
-
- <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner">
- <property name="name" value="BareMetalPlanner" />
- </bean>
-
-</beans>
[2/2] git commit: updated refs/heads/master to b4ceefa
Posted by ts...@apache.org.
Adding readable start and end time stamps
Signed-off-by: Santhosh Edukulla <Sa...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4ceefa4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4ceefa4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b4ceefa4
Branch: refs/heads/master
Commit: b4ceefa469cfc1ebce8e162ed569a5c844d8765e
Parents: f4fb5f5
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Fri Oct 25 23:39:35 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Oct 28 11:29:27 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/marvinPlugin.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b4ceefa4/tools/marvin/marvin/marvinPlugin.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/marvinPlugin.py b/tools/marvin/marvin/marvinPlugin.py
index 3b282e4..c5931e0 100644
--- a/tools/marvin/marvin/marvinPlugin.py
+++ b/tools/marvin/marvin/marvinPlugin.py
@@ -140,9 +140,10 @@ class MarvinPlugin(Plugin):
if self.startTime is not None:
totTime = int(endTime - self.startTime)
self.logger.debug(
- "****TestCaseName: %s; Time Taken: %s Seconds; \
- StartTime: %s; EndTime: %s****"
- % (self.testName, str(totTime), self.startTime, endTime))
+ "TestCaseName: %s; Time Taken: %s Seconds; \
+ StartTime: %s; EndTime: %s"
+ % (self.testName, str(totTime),
+ str(time.ctime(self.startTime)), str(time.ctime(endTime))))
def _injectClients(self, test):
self.debug_stream. \