atlas git commit: ATLAS-2835: Regression: Classifications propagated from term is not removed during term-entity disassociation - #Add missing import

2018-08-23 Thread sarath
Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 5c0e00bbb -> 41f35aaf2


ATLAS-2835: Regression: Classifications propagated from term is not removed 
during term-entity disassociation - #Add missing import


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

Branch: refs/heads/branch-1.0
Commit: 41f35aaf235261b552b052065228e54c0cf3e337
Parents: 5c0e00b
Author: Sarath Subramanian 
Authored: Thu Aug 23 13:18:25 2018 -0700
Committer: Sarath Subramanian 
Committed: Thu Aug 23 13:18:25 2018 -0700

--
 .../apache/atlas/repository/store/graph/v2/EntityGraphMapper.java   | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/41f35aaf/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
--
diff --git 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
index 541f038..9b533b7 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -94,6 +94,7 @@ import static 
org.apache.atlas.repository.graph.GraphHelper.getTraitLabel;
 import static org.apache.atlas.repository.graph.GraphHelper.getTraitNames;
 import static org.apache.atlas.repository.graph.GraphHelper.getTypeName;
 import static org.apache.atlas.repository.graph.GraphHelper.getTypeNames;
+import static org.apache.atlas.repository.graph.GraphHelper.isActive;
 import static 
org.apache.atlas.repository.graph.GraphHelper.isPropagationEnabled;
 import static org.apache.atlas.repository.graph.GraphHelper.isRelationshipEdge;
 import static org.apache.atlas.repository.graph.GraphHelper.string;



atlas git commit: ATLAS-2814: Cluster stores replication details. Part #2

2018-08-23 Thread amestry
Repository: atlas
Updated Branches:
  refs/heads/branch-0.8 ffda4ea78 -> fb30afba4


ATLAS-2814: Cluster stores replication details. Part #2


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

Branch: refs/heads/branch-0.8
Commit: fb30afba4089290af1e066882f41dbaf2b68a285
Parents: ffda4ea
Author: Ashutosh Mestry 
Authored: Thu Aug 23 16:18:24 2018 -0700
Committer: Ashutosh Mestry 
Committed: Thu Aug 23 16:18:24 2018 -0700

--
 .../org/apache/atlas/web/resources/AdminExportImportTestIT.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/fb30afba/webapp/src/test/java/org/apache/atlas/web/resources/AdminExportImportTestIT.java
--
diff --git 
a/webapp/src/test/java/org/apache/atlas/web/resources/AdminExportImportTestIT.java
 
b/webapp/src/test/java/org/apache/atlas/web/resources/AdminExportImportTestIT.java
index 7acd332..cc5d36b 100644
--- 
a/webapp/src/test/java/org/apache/atlas/web/resources/AdminExportImportTestIT.java
+++ 
b/webapp/src/test/java/org/apache/atlas/web/resources/AdminExportImportTestIT.java
@@ -109,14 +109,14 @@ public class AdminExportImportTestIT extends 
BaseResourceIT {
 }
 
 @AfterClass
-protected void teardown() {
+public void teardown() {
 AtlasImportRequest request = new AtlasImportRequest();
 request.getOptions().put(AtlasImportRequest.TRANSFORMS_KEY, 
IMPORT_TRANSFORM_SET_DELETED);
 
 try {
 performImport(FILE_TO_IMPORT, request);
 } catch (AtlasServiceException e) {
-throw new SkipException("performTeardown: failed! Subsequent tests 
results may be affected.", e);
+throw new SkipException("performTeardown: failed! Subsequent tests 
results may be affected.");
 }
 }
 }



atlas git commit: ATLAS-2820 : Replication audits details json are not rendered

2018-08-23 Thread nixon
Repository: atlas
Updated Branches:
  refs/heads/branch-0.8 b432547b8 -> ffda4ea78


ATLAS-2820 : Replication audits details json are not rendered

Signed-off-by: nixonrodrigues 


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

Branch: refs/heads/branch-0.8
Commit: ffda4ea78778dbbff403473065e253289357064c
Parents: b432547
Author: kevalbhatt 
Authored: Fri Aug 17 18:35:09 2018 +0530
Committer: nixonrodrigues 
Committed: Thu Aug 23 15:39:18 2018 +0530

--
 .../public/js/views/audit/ReplicationAuditTableLayoutView.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/ffda4ea7/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
--
diff --git 
a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js 
b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
index a8f15f3..a18b938 100644
--- a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
+++ b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js
@@ -198,7 +198,7 @@ define(['require',
 var guid = $(e.target).data("guid"),
 model = 
that.searchCollection.fullCollection.findWhere({ 'guid': guid }),
 result = JSON.parse(model.get("resultSummary")),
-view = "" + CommonViewFunction.propertyTable({ scope: that, valueObject: 
result, attributeDefs: that.attributeDefs, extractJSON: { extractKey: 'value' } 
}) + "";
+view = "" + CommonViewFunction.propertyTable({ scope: that, valueObject: 
result, attributeDefs: that.attributeDefs }) + "";
 var modal = new Modal({
 title: model.get("operation") + " Details",
 content: view,