You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/01/17 19:31:03 UTC
git commit: Adds the NOTICE file and updates the LICENSE.
Updated Branches:
refs/heads/master 80ccdc302 -> e3e81a1d9
Adds the NOTICE file and updates the LICENSE.
Bugs closed: AURORA-3
Reviewed at https://reviews.apache.org/r/17030/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/e3e81a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/e3e81a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/e3e81a1d
Branch: refs/heads/master
Commit: e3e81a1d9d62b61b9b50faf28a96855be466898a
Parents: 80ccdc3
Author: Jake Farrell <jf...@apache.org>
Authored: Fri Jan 17 10:26:46 2014 -0800
Committer: Bill Farner <wf...@apache.org>
Committed: Fri Jan 17 10:30:39 2014 -0800
----------------------------------------------------------------------
LICENSE | 9 +++++++++
NOTICE | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e3e81a1d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 2309664..bc7ee73 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,3 +201,12 @@
See the License for the specific language governing permissions and
limitations under the License.
+-------------------------------------------------------------------------------
+SOFTWARE DISTRIBUTED WITH APACHE AURORA:
+
+The Apache Aurora software includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions as outlined in the NOTICE file.
+
+-------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e3e81a1d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..145370d
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,50 @@
+Apache Aurora
+Copyright 2013 The Apache Software Foundation
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+
+From: 'An unknown organization'
+ - AOP alliance (http://aopalliance.sourceforge.net)
+ License: Public Domain
+ - FindBugs (http://findbugs.sourceforge.net/)
+ License: The Apache Software License, Version 2.0
+
+From: 'Antlr' (http://www.antlr.org/)
+ - Antlr (http://www.antlr.org/)
+ License: BSD License
+
+From: 'The Apache Software Foundation' (http://www.apache.org)
+ - Apache Commons Lang (http://commons.apache.org/)
+ License: The Apache Software License, Version 2.0
+ - Apache Log4j (http://logging.apache.org/)
+ License: The Apache Software License, Version 2.0
+ - Apache Mesos (http://mesos.apache.org/)
+ License: The Apache Software License, Version 2.0
+ - Apache Thrift (http://thrift.apache.org/)
+ License: The Apache Software License, Version 2.0
+ - Apache Zookeeper (http://zookeeper.apache.org/)
+ License: The Apache Software License, Version 2.0
+
+From: 'Google, Inc.' (http://www.google.com)
+ - Google Guava (http://code.google.com/p/guava-libraries)
+ License: The Apache Software License, Version 2.0
+ - Google Guice (http://code.google.com/p/google-guice/)
+ License: The Apache Software License, Version 2.0
+ - Google Protocol Buffers (http://code.google.com/p/protobuf)
+ License: BSD 3 License
+
+From: 'Oracle, Inc.' (http://www.oracle.com)
+ - Jersey (https://jersey.java.net/)
+ License: Common Development and Distrobution License (CDDL - Version 1.1)
+
+From: 'Twitter, Inc.' (http://www.twitter.com)
+ - Twitter Commons (https://github.com/twitter/commons)
+ License: The Apache Software License, Version 2.0
+
+From: 'QOS.ch' (http://www.qos.ch)
+ - Log4j Implemented Over SLF4J (http://www.slf4j.org)
+ License: Apache Software Licenses
+ - SLF4J (http://www.slf4j.org)
+ License: MIT License