CHUKWA-628. Updated LICENSE.txt and NOTICE.txt to meet IPMC request. …

…(Eric Yang) git-svn-id: https://svn.apache.org/repos/asf/incubator/chukwa/branches/chukwa-0.5@1228577 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 7, 2012 · 8c075eb · 8c075eb
1 parent 82c441f
commit 8c075eb
Show file tree

Hide file tree

Showing 19 changed files with 382 additions and 1,338 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,12 +1,9 @@
 Apache Chukwa
-Copyright 2011 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Chukwa incorporates a number of components, not copyright by the Apache
-Foundation, and under permissive licenses.
-
 iUI is under BSD license, with media portions under a 
 Creative Commons Attribution-Share Alike 3.0 License. 
 Copyright is held by its developers.
@@ -22,3 +19,10 @@ HTML Filtering utility for Java is under Creative Commons Attribution-ShareAlike
 JUnit (http://www.junit.org/) included under the Common Public License v1.0.  See
 the full text here: http://junit.sourceforge.net/cpl-v10.html
 
+YUI is copyright 2009 by Yahoo, Inc, and distributed under a BSD license.
+* Available from http://developer.yahoo.com/yui/
+
+This product includes the JQuery JavaScript library, developed by
+John Resig, distributed under the terms of the MIT license.
+* Available from http://jquery.com/
+
diff --git a/conf/aggregator.sql b/conf/aggregator.sql