atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject incubator-atlas git commit: ATLAS-1306: bootstrap type-load ignores model file contents if a type in the file already exists
Date Fri, 18 Nov 2016 06:49:40 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 1b066acb0 -> 710c17f55


ATLAS-1306: bootstrap type-load ignores model file contents if a type in the file already
exists


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/710c17f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/710c17f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/710c17f5

Branch: refs/heads/master
Commit: 710c17f5505d99429d76ae16479f31d6c09dbd81
Parents: 1b066ac
Author: Madhan Neethiraj <madhan@apache.org>
Authored: Thu Nov 17 21:21:19 2016 -0800
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Thu Nov 17 22:49:17 2016 -0800

----------------------------------------------------------------------
 release-log.txt                                                    | 2 +-
 .../repository/store/bootstrap/AtlasTypeDefStoreInitializer.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/710c17f5/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 920df70..a3f4f20 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,7 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements
for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
-
+ATLAS-1306 bootstrap type-load ignores model file contents if a type in the file already
exists
 ATLAS-1299 The project org.apache.atlas:atlas-hbase-client-shaded - build error (shwethags)
 ATLAS-1246 Upgrade versions of dependencies (shwethags)
 ATLAS-1244 added support for KnoxSSO Authentication (nixonrodrigues via mneethiraj)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/710c17f5/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java
b/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java
index 036a548..c8c22eb 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/bootstrap/AtlasTypeDefStoreInitializer.java
@@ -127,7 +127,7 @@ public class AtlasTypeDefStoreInitializer {
 
                 LOG.info("Loading types defined in file {}", typeDefFile.getAbsolutePath());
 
-                typeDefStore.createTypesDef(typesDef);
+                typeDefStore.createTypesDef(typesToCreate);
             } catch (Throwable t) {
                 LOG.error("error while registering types in file " + typeDefFile.getAbsolutePath(),
t);
             }


Mime
View raw message