Merge remote-tracking branch 'origin/guice-enabled'
Conflicts:
repository/pom.xml
repository/src/main/java/org/apache/hadoop/metadata/services/GraphBackedMetadataRepository.java
repository/src/main/java/org/apache/hadoop/metadata/services/MetadataRepository.java
repository/src/main/java/org/apache/hadoop/metadata/services/TitanGraphService.java
repository/src/test/java/org/apache/hadoop/metadata/services/GraphBackedMetadataRepositoryTest.java
webapp/src/main/java/org/apache/hadoop/metadata/web/resources/EntityResource.java
webapp/src/main/resources/application.properties
webapp/src/test/java/org/apache/hadoop/metadata/GraphRepositoryServiceIT.java
Showing
webapp/src/test/resources/graph.properties
0 → 100644
webapp/src/test/resources/indexer.properties
0 → 100644
Please
register
or
sign in
to comment