You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/09/02 14:32:51 UTC
[1/2] git commit: updated refs/heads/master to b220403
Updated Branches:
refs/heads/master e12c0c4e4 -> b220403e3
the cloud-engine-storage-integration-test sub-project should not depend
on the nonoss build. It can be enabled with its own profile
"integration-test".
Removing the nonoss activation tag from the profile.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d499f0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d499f0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d499f0a
Branch: refs/heads/master
Commit: 0d499f0af09ce30689a0bc935eb6e2adbe1b4c47
Parents: e12c0c4
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Sep 2 14:29:01 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Sep 2 14:32:25 2013 +0200
----------------------------------------------------------------------
engine/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d499f0a/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 040246a..27254d5 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -47,11 +47,6 @@
<profiles>
<profile>
<id>integration-test</id>
- <activation>
- <property>
- <name>nonoss</name>
- </property>
- </activation>
<modules>
<module>storage/integration-test</module>
</modules>
[2/2] git commit: updated refs/heads/master to b220403
Posted by hu...@apache.org.
Fix EndpointSelectorTest, LockMasterListener is in the server package
for now.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b220403e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b220403e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b220403e
Branch: refs/heads/master
Commit: b220403e3587520d42c1a77dbfc76439fa4ea8af
Parents: 0d499f0
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Sep 2 14:31:47 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Sep 2 14:32:28 2013 +0200
----------------------------------------------------------------------
.../org/apache/cloudstack/storage/test/EndpointSelectorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b220403e/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
index 15233bf..e319142 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
@@ -19,7 +19,7 @@
package org.apache.cloudstack.storage.test;
import com.cloud.agent.AgentManager;
-import com.cloud.cluster.LockMasterListener;
+import com.cloud.server.LockMasterListener;
import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterVO;