You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by dk...@apache.org on 2016/08/11 19:06:00 UTC

incubator-atlas git commit: ATLAS-1117 Atlas start fails on trunk (jnhagelb via dkantor)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master c1efcf061 -> 531a9684f


ATLAS-1117 Atlas start fails on trunk (jnhagelb via dkantor)


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

Branch: refs/heads/master
Commit: 531a9684f57836a600e7172d7b6d089cef19f7ca
Parents: c1efcf0
Author: Jeff Hagelberg <jn...@us.ibm.com>
Authored: Thu Aug 11 19:39:35 2016 +0100
Committer: Dave Kantor <dk...@us.ibm.com>
Committed: Thu Aug 11 15:05:29 2016 -0400

----------------------------------------------------------------------
 graphdb/titan0/pom.xml | 5 +++--
 release-log.txt        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/531a9684/graphdb/titan0/pom.xml
----------------------------------------------------------------------
diff --git a/graphdb/titan0/pom.xml b/graphdb/titan0/pom.xml
index f2dc9a8..ca8c0fb 100644
--- a/graphdb/titan0/pom.xml
+++ b/graphdb/titan0/pom.xml
@@ -165,9 +165,10 @@
                             <filters>
                                 <filter>
                                     <artifact>com.thinkaurelius.titan:titan-core</artifact>
-                                    <!-- force use of our custom LocalLockMediator implementation -->
+                                    <!-- force use of our custom titan class implementations -->
                                     <excludes>
-                                        <exclude>com/thinkaurelius/titan/diskstorage/locking/LocalLockMediator*</exclude>
+                                        <exclude>com/thinkaurelius/titan/diskstorage/locking/LocalLockMediator.class</exclude>
+                                        <exclude>com/thinkaurelius/titan/graphdb/query/graph/GraphCentricQueryBuilder.class</exclude>
                                     </excludes>
                                 </filter>
 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/531a9684/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 1a54f2a..73c44ea 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
 ATLAS-1060 Add composite indexes for exact match performance improvements for all attributes (sumasai via shwethags)
 
 ALL CHANGES:
+ATLAS-1117 Atlas start fails on trunk (jnhagelb via dkantor)
 ATLAS-1112 Hive table GET response from atlas server had duplicate column entries ( ayubkhan, mneethiraj via sumasai)
 ATLAS-1108 In Atlas HA mode , import-hive.sh in Passive instance fails. (ayubkhan via sumasai)
 ATLAS-991 Lower bound checking not always disabled for entities being deleted (dkantor)