You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/05/08 19:22:16 UTC
incubator-brooklyn git commit: Really fix #628 merge - there were
import conflicts.
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 8880bcd00 -> addf30e23
Really fix #628 merge - there were import conflicts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/addf30e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/addf30e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/addf30e2
Branch: refs/heads/master
Commit: addf30e23d5b3a2385a1719ee83d904787ede816
Parents: 8880bcd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri May 8 18:21:47 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri May 8 18:21:47 2015 +0100
----------------------------------------------------------------------
.../java/brooklyn/location/jclouds/JcloudsLocationTest.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/addf30e2/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationTest.java
index bb1ef6b..60aec22 100644
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationTest.java
@@ -30,12 +30,9 @@ import javax.annotation.Nullable;
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.Template;
-<<<<<<< HEAD
-import org.mockito.Mockito;
-=======
import org.jclouds.scriptbuilder.domain.OsFamily;
import org.jclouds.scriptbuilder.domain.StatementList;
->>>>>>> apache-gh/pr/628
+import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;