You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by ms...@apache.org on 2019/09/12 09:48:49 UTC

[incubator-ratis] branch master updated: RATIS-668. Fix NOTICE file. Contributed by Arpit Agarwal.

This is an automated email from the ASF dual-hosted git repository.

msingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new 67ba9cd  RATIS-668. Fix NOTICE file. Contributed by Arpit Agarwal.
67ba9cd is described below

commit 67ba9cd875f72705d4177e72db7bc8df5539a91c
Author: Mukul Kumar Singh <mu...@cloudera.com>
AuthorDate: Thu Sep 12 15:18:20 2019 +0530

    RATIS-668. Fix NOTICE file. Contributed by Arpit Agarwal.
---
 NOTICE                                   | 19 +++++++++++--------
 ratis-assembly/src/main/resources/NOTICE | 15 ---------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/NOTICE b/NOTICE
index bdb7c58..18a495d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -5,6 +5,7 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 --
+
 This product uses the dropwizard-hadoop-metrics2.
 
 Copyright 2016 Josh Elser
@@ -12,18 +13,20 @@ Copyright 2016 Josh Elser
 Licensed under the Apache License v2.0
 
 --
-This product uses https://github.com/mbocek/docker-ganglia/
 
-Contributed by Michal Bocek
+Notice for Dropwizard:
 
-Licensed under the Apache License v2.0
-https://github.com/mbocek/docker-ganglia/blob/master/LICENSE
+Metrics
+Copyright 2010-2013 Coda Hale and Yammer, Inc., 2014-2017 Dropwizard Team
 
---
-This product uses https://github.com/graphite-project/docker-graphite-statsd
+This product includes software developed by Coda Hale and Yammer, Inc.
 
-Copyright (c) 2013-2016 Nathan Hopkins
+This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
+LongAdder), which was released with the following comments:
 
-Licensed under the MIT License
+    Written by Doug Lea with assistance from members of JCP JSR-166
+    Expert Group and released to the public domain, as explained at
+    http://creativecommons.org/publicdomain/zero/1.0/
 
 --
+
diff --git a/ratis-assembly/src/main/resources/NOTICE b/ratis-assembly/src/main/resources/NOTICE
index 7e3cbd6..694e3c0 100644
--- a/ratis-assembly/src/main/resources/NOTICE
+++ b/ratis-assembly/src/main/resources/NOTICE
@@ -322,19 +322,4 @@ Copyright 2016 Josh Elser
 
 Licensed under the Apache License v2.0
 
------------------------------------------------------------------------
-This product uses https://github.com/mbocek/docker-ganglia/
-
-Contributed by Michal Bocek
-
-Licensed under the Apache License v2.0
-https://github.com/mbocek/docker-ganglia/blob/master/LICENSE
-
------------------------------------------------------------------------
-This product uses https://github.com/graphite-project/docker-graphite-statsd
-
-Copyright (c) 2013-2016 Nathan Hopkins
-
-Licensed under the MIT License
-
 --