From db61558bb480dd6f39eaa3e6235d9f0c193f3a6a Mon Sep 17 00:00:00 2001 From: anfeng Date: Sat, 15 Feb 2014 11:55:42 -0800 Subject: [PATCH 1/2] remove Yahoo copyright from NOTICE files --- NOTICE | 5 +---- storm-dist/binary/NOTICE | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/NOTICE b/NOTICE index 35e9475a716..a6a160ab557 100644 --- a/NOTICE +++ b/NOTICE @@ -2,7 +2,4 @@ Apache Storm Copyright 2014 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This product includes software developed by Yahoo! Inc. (www.yahoo.com) -Copyright © 2012-2013 Yahoo! Inc. All rights reserved. +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/storm-dist/binary/NOTICE b/storm-dist/binary/NOTICE index 43fcf840207..2036617b73b 100644 --- a/storm-dist/binary/NOTICE +++ b/storm-dist/binary/NOTICE @@ -4,9 +4,6 @@ Copyright 2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -This product includes software developed by Yahoo! Inc. (www.yahoo.com) -Copyright © 2012-2013 Yahoo! Inc. All rights reserved. - YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/). Copyright (c) 2008-2010 Andrey Somov From d2a0bcd99e806922fb6443d2764f8c3ceb52aca1 Mon Sep 17 00:00:00 2001 From: anfeng Date: Mon, 17 Feb 2014 19:01:23 -0800 Subject: [PATCH 2/2] NOTICE revised regarding Yahoo contribution --- NOTICE | 5 ++++- storm-dist/binary/NOTICE | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index a6a160ab557..637e578c5e4 100644 --- a/NOTICE +++ b/NOTICE @@ -2,4 +2,7 @@ Apache Storm Copyright 2014 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file +The Apache Software Foundation (http://www.apache.org/). + +This product includes software developed by Yahoo! Inc. (www.yahoo.com) +Copyright (c) 2012-2014 Yahoo! Inc. \ No newline at end of file diff --git a/storm-dist/binary/NOTICE b/storm-dist/binary/NOTICE index 2036617b73b..6e3d43b5dd3 100644 --- a/storm-dist/binary/NOTICE +++ b/storm-dist/binary/NOTICE @@ -4,6 +4,9 @@ Copyright 2014 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This product includes software developed by Yahoo! Inc. (www.yahoo.com) +Copyright (c) 2012-2014 Yahoo! Inc. + YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/). Copyright (c) 2008-2010 Andrey Somov