From 0d0005ac15115a038a618a3eeb7aba4803693d84 Mon Sep 17 00:00:00 2001 From: Misha Brukman Date: Fri, 7 Apr 2017 23:50:01 -0400 Subject: [PATCH] Clarifications to AUTHORS.txt and NOTICE.txt AUTHORS.txt * For clarity, add Aurelius explicitly, even though DataStax acquisition implies that DataStax owns Aurelius IP * Add IBM to the list of authors since we've had contributions from several IBM folks already NOTICE.txt * Update the copyright statement to include all JanusGraph copyright holders / authors * Include reference to JanusGraph contributors * Remove link to thinkaurelius.com as it redirects to DataStax and is thus not useful to learn about Aurelius; instead, mention that it was acquired by DataStax This addresses issue #203 [skip ci] Signed-off-by: Misha Brukman --- AUTHORS.txt | 4 +++- NOTICE.txt | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 860459d456..70c5de6ff3 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -11,8 +11,10 @@ # Please keep the list sorted. +Aurelius DataStax Dylan Bethune-Waddell Expero Google -Rafael Fernandes \ No newline at end of file +IBM +Rafael Fernandes diff --git a/NOTICE.txt b/NOTICE.txt index 42517dbf7d..67f5bba97c 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,16 +1,19 @@ ============================================================== JanusGraph: Distributed Graph Database - Copyright 2012 and onwards Aurelius + Copyright 2012 and onwards JanusGraph Authors ============================================================== -This product includes software developed by Aurelius (http://thinkaurelius.com/) and the following individuals: +This product includes software developed by JanusGraph contributors listed +in CONTRIBUTORS.txt; JanusGraph copyright holders are listed in AUTHORS.txt. + +This product is based on Titan, originally developed by Aurelius (acquired by +DataStax) and the following individuals: * Matthias Broecheler * Dan LaRocque * Marko A. Rodriguez * Stephen Mallette * Pavel Yaskevich - * Others as listed in CONTRIBUTORS.txt It also includes software from other open source projects including, but not limited to (check pom.xml for complete listing):