brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [4/4] incubator-brooklyn git commit: Fix conflicts after merging #833
Date Tue, 18 Aug 2015 06:39:27 GMT
Fix conflicts after merging #833


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5dfe944e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5dfe944e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5dfe944e

Branch: refs/heads/master
Commit: 5dfe944e589ff3a0ce292583cc20a9e62c6ed97b
Parents: f9b357d
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Tue Aug 18 02:39:06 2015 -0400
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Tue Aug 18 02:39:06 2015 -0400

----------------------------------------------------------------------
 .../brooklyn/core/catalog/internal/CatalogXmlSerializer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5dfe944e/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogXmlSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogXmlSerializer.java
b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogXmlSerializer.java
index 49462e2..5714fd2 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogXmlSerializer.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogXmlSerializer.java
@@ -28,8 +28,8 @@ import org.apache.brooklyn.core.util.xstream.EnumCaseForgivingSingleValueConvert
 import org.apache.brooklyn.core.util.xstream.XmlSerializer;
 
 import org.apache.brooklyn.basic.AbstractBrooklynObject;
-import brooklyn.util.xstream.EnumCaseForgivingSingleValueConverter;
-import brooklyn.util.xstream.XmlSerializer;
+import org.apache.brooklyn.core.util.xstream.EnumCaseForgivingSingleValueConverter;
+import org.apache.brooklyn.core.util.xstream.XmlSerializer;
 
 public class CatalogXmlSerializer extends XmlSerializer<Object> {
 


Mime
View raw message