From af7acfaa60fc67c1523069be3e6acd4d7c018daf Mon Sep 17 00:00:00 2001 From: Ohad Shacham Date: Mon, 26 Mar 2018 11:31:37 +0300 Subject: [PATCH 1/3] [OMID-44] Since YCSB files are includes in OMID a reference in Yahoo is needed in the NOTICE file. Subject raised at: https://lists.apache.org/thread.html/10fd534d9ea4b0a4574637ab49e5d823a47a864ec27f317f90b14196@%3Cgeneral.incubator.apache.org%3E --- NOTICE | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NOTICE b/NOTICE index 8a71af072..ace5d9554 100644 --- a/NOTICE +++ b/NOTICE @@ -3,3 +3,10 @@ Copyright 2016 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +The files: +./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java +./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java +./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java +./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java +developed at Yahoo (http://www.yahoo.com/) and licensed under the Apache v2.0 License. Original source copywrite: Copyright (c) 2010 Yahoo! Inc. + From 302731208254f35698c15b2dc46e44c358dd3b86 Mon Sep 17 00:00:00 2001 From: Ohad Shacham Date: Thu, 26 Apr 2018 12:33:01 +0300 Subject: [PATCH 2/3] [OMID-44] update the date and make the NOTICE as simple as possible. --- NOTICE | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/NOTICE b/NOTICE index ace5d9554..0b0b842dd 100644 --- a/NOTICE +++ b/NOTICE @@ -1,12 +1,5 @@ Apache Omid -Copyright 2016 The Apache Software Foundation. +Copyright 2016-2018 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - -The files: -./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java -./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java -./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java -./benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java -developed at Yahoo (http://www.yahoo.com/) and licensed under the Apache v2.0 License. Original source copywrite: Copyright (c) 2010 Yahoo! Inc. - +This product also includes software developed at Yahoo (http://www.yahoo.com/). Licensed under the Apache v2.0 License From 0ba57a3cdf4229788d7d3f2db394130ec84e7c98 Mon Sep 17 00:00:00 2001 From: Ohad Shacham Date: Sun, 13 May 2018 10:44:48 +0300 Subject: [PATCH 3/3] Integrating Justin's comments. --- NOTICE | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 0b0b842dd..dbcca0fb7 100644 --- a/NOTICE +++ b/NOTICE @@ -2,4 +2,7 @@ Apache Omid Copyright 2016-2018 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -This product also includes software developed at Yahoo (http://www.yahoo.com/). Licensed under the Apache v2.0 License + +This product includes software developed by + Yahoo! Inc. (www.yahoo.com) + Copyright (c) 2010 Yahoo! Inc. All rights reserved.