> On March 19, 2018, 12:31 a.m., David Radley wrote: > > distro/src/conf/atlas-application.properties > > Line 23 (original), 23 (patched) > > <https://reviews.apache.org/r/65885/diff/2/?file=1972866#file1972866line23> > > > > Sorry for the delay in reviewing. Unfortunatley the patch now does not > > apply to master I get: > > git am < ../ATLAS-2470-2.patch > > Applying: ATLAS-2470 - JanusGraph Cassandra support > > .git/rebase-apply/patch:1146: trailing whitespace. > > # The number of ticks that the initial > > error: patch failed: distro/src/conf/atlas-application.properties:24 > > error: distro/src/conf/atlas-application.properties: patch does not > > apply > > .git/rebase-apply/patch:1039: new blank line at EOF. > > + > > .git/rebase-apply/patch:2761: new blank line at EOF. > > + > > Patch failed at 0001 ATLAS-2470 - JanusGraph Cassandra support
Ok.. I uploaded a new diff after rebasing off of master. However it still cannot be applied for similar reasons. A quick google soved my issues... git am --3way < ATLAS-2470-3.patch properly applies the patch. https://www.lullabot.com/articles/git-best-practices-upgrading-the-patch-process - Pierre ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/65885/#review199398 ----------------------------------------------------------- On March 19, 2018, 11:51 a.m., Pierre Padovani wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/65885/ > ----------------------------------------------------------- > > (Updated March 19, 2018, 11:51 a.m.) > > > Review request for atlas and David Radley. > > > Bugs: ATLAS-2470 > https://issues.apache.org/jira/browse/ATLAS-2470 > > > Repository: atlas > > > Description > ------- > > This updates pom's to add the needed cassandra jars, and adds a dist profile > embedded-cassandra-solr. > > > Diffs > ----- > > distro/pom.xml 0103bef6 > distro/src/bin/atlas_config.py e6415cf4 > distro/src/bin/atlas_start.py 39be6b7c > distro/src/bin/atlas_stop.py 66edd904 > distro/src/conf/atlas-application.properties 10fb7b86 > distro/src/conf/atlas-env.sh 68b24e93 > distro/src/conf/cassandra.yml.template PRE-CREATION > distro/src/conf/zookeeper/log4j.properties PRE-CREATION > distro/src/conf/zookeeper/zoo.cfg.template PRE-CREATION > distro/src/main/assemblies/standalone-package.xml 1881082e > docs/src/site/twiki/InstallationSteps.twiki 6b9f0313 > graphdb/janus/pom.xml 143b775f > repository/pom.xml b1d6b1f9 > > repository/src/main/java/org/apache/atlas/repository/audit/AbstractStorageBasedAuditRepository.java > PRE-CREATION > > repository/src/main/java/org/apache/atlas/repository/audit/CassandraBasedAuditRepository.java > PRE-CREATION > > repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java > cee7374e > > repository/src/test/java/org/apache/atlas/repository/audit/AuditRepositoryTestBase.java > 4d70b7f7 > > repository/src/test/java/org/apache/atlas/repository/audit/CassandraAuditRepositoryTest.java > PRE-CREATION > repository/src/test/resources/cassandra_test.yml PRE-CREATION > > server-api/src/main/java/org/apache/atlas/listener/ActiveStateChangeHandler.java > 7d282b30 > > > Diff: https://reviews.apache.org/r/65885/diff/3/ > > > Testing > ------- > > Full build with the new embedded-cassandra-solr, and testing to make sure > Atlas comes up and is functional. > > Be aware that we have been running Cassandra backed JanusGraph for months > with no issues. > > This patch now includes support for Cassandra as an audit store. I've also > refactored the audit unit tests, and added cassandra specific tests. > > > Thanks, > > Pierre Padovani > >
