atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suma...@apache.org
Subject [25/26] incubator-atlas git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-atlas into branch-0.6-incubating
Date Fri, 18 Dec 2015 10:44:25 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-atlas into branch-0.6-incubating


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

Branch: refs/heads/branch-0.6-incubating
Commit: 128b1511fd469af8e9d5a36d01d842ccb7f668e1
Parents: eafe433 2cae42c
Author: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Authored: Fri Dec 18 16:11:20 2015 +0530
Committer: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Committed: Fri Dec 18 16:11:20 2015 +0530

----------------------------------------------------------------------
 distro/src/conf/application.properties          |  1 +
 docs/src/site/twiki/Bridge-Hive.twiki           | 12 +--
 docs/src/site/twiki/Configuration.twiki         |  3 +-
 .../org/apache/atlas/kafka/KafkaConsumer.java   |  6 ++
 .../AbstractNotificationConsumer.java           |  5 +-
 .../notification/NotificationConsumer.java      |  9 +-
 .../notification/NotificationHookConsumer.java  | 79 ++++++++++-------
 release-log.txt                                 | 14 ++-
 .../atlas/repository/graph/GraphHelper.java     |  2 +-
 .../repository/graph/TitanGraphProvider.java    |  2 -
 .../graph/TypedInstanceToGraphMapper.java       |  4 +
 .../graph/TitanGraphProviderTest.java           |  3 +
 server-api/pom.xml                              |  2 +-
 .../src/main/resources/application.properties   |  1 +
 .../notification/EntityNotificationIT.java      | 89 ++++----------------
 .../NotificationHookConsumerIT.java             |  8 +-
 .../atlas/web/resources/BaseResourceIT.java     | 86 ++++++++++---------
 .../web/resources/EntityJerseyResourceIT.java   | 35 +++-----
 18 files changed, 171 insertions(+), 190 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/128b1511/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
----------------------------------------------------------------------
diff --cc repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
index 26d5e2b,2cc1a50..6ab7a21
--- a/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
+++ b/repository/src/main/java/org/apache/atlas/repository/graph/TitanGraphProvider.java
@@@ -22,14 -22,9 +22,12 @@@ import com.google.common.collect.Immuta
  import com.google.inject.Provides;
  import com.thinkaurelius.titan.core.TitanFactory;
  import com.thinkaurelius.titan.core.TitanGraph;
- import com.thinkaurelius.titan.core.TitanTransaction;
  import com.thinkaurelius.titan.core.schema.TitanManagement;
- import com.thinkaurelius.titan.diskstorage.Backend;
  import com.thinkaurelius.titan.diskstorage.StandardIndexProvider;
 +import com.thinkaurelius.titan.diskstorage.indexing.IndexInformation;
  import com.thinkaurelius.titan.diskstorage.solr.Solr5Index;
 +import com.thinkaurelius.titan.graphdb.configuration.GraphDatabaseConfiguration;
 +import com.thinkaurelius.titan.graphdb.database.StandardTitanGraph;
  import org.apache.atlas.ApplicationProperties;
  import org.apache.atlas.AtlasException;
  import org.apache.commons.configuration.Configuration;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/128b1511/webapp/src/test/java/org/apache/atlas/web/resources/EntityJerseyResourceIT.java
----------------------------------------------------------------------


Mime
View raw message