You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jc...@apache.org on 2016/09/20 19:54:47 UTC
aurora git commit: Clean up some license issues.
Repository: aurora
Updated Branches:
refs/heads/master a9f4e26a2 -> ae4db02fd
Clean up some license issues.
Reviewed at https://reviews.apache.org/r/52093/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/ae4db02f
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/ae4db02f
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/ae4db02f
Branch: refs/heads/master
Commit: ae4db02fd648db611cd1a5ab5188ec9463e679a5
Parents: a9f4e26
Author: Joshua Cohen <jc...@apache.org>
Authored: Tue Sep 20 14:54:34 2016 -0500
Committer: Joshua Cohen <jc...@apache.org>
Committed: Tue Sep 20 14:54:34 2016 -0500
----------------------------------------------------------------------
LICENSE | 102 +++++++++++++++++++
NOTICE | 2 +-
.../python/apache/aurora/client/cli/cron.py | 2 -
.../apache/aurora/client/cli/test_cron.py | 2 -
4 files changed, 103 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/ae4db02f/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 775eaed..72c25cf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -296,6 +296,52 @@ THE SOFTWARE.
-------------------------------------------------------------------------------
+Sizzle (https://sizzlejs.com/)
+ Location: javascript/scheduler/assets/bower_components/jquery
+ src/main/python/apache/thermos/observer/http/assets/jquery.js
+ From: 'The jQuery Foundation' (http://www.jquery.com/)
+ License: MIT License
+
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/sizzle
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+All files located in the node_modules and external directories are
+externally maintained libraries used by this software which have their
+own licenses; we recommend you read them, as their terms may differ from
+the terms above.
+
+-------------------------------------------------------------------------------
+
+
Moment.js (http://momentjs.com/)
Location: 3rdparty/javascript/scheduler/assets/bower_components/momentjs
From: 'Tim Wood, Iskren Chernev' (http://momentjs.com/)
@@ -432,3 +478,59 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+
+Glyphicons Halflings (http://glyphicons.com/)
+ Location: 3rdparty/javascript/scheduler/assets/bower_components/bootstrap/fonts/
+ From: 'Jan Kovarik' (http://glyphicons.com/)
+ License: MIT License
+
+Copyright (c) 2010 - 2016 Jan Kovarik
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+
+Normalize.css (https://necolas.github.io/normalize.css/)
+ Location: 3rdparty/javascript/scheduler/assets/bower_components/bootstrap/less/normalize.less
+ From: 'Nicolas Gallagher, Jonathan Neal' (https://necolas.github.io/normalize.css/)
+ License: MIT License
+
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/aurora/blob/ae4db02f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 94ea47d..7516b15 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Aurora
-Copyright 2014-2015 The Apache Software Foundation
+Copyright 2014-2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/aurora/blob/ae4db02f/src/main/python/apache/aurora/client/cli/cron.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/cron.py b/src/main/python/apache/aurora/client/cli/cron.py
index 33087f1..b0c57cb 100644
--- a/src/main/python/apache/aurora/client/cli/cron.py
+++ b/src/main/python/apache/aurora/client/cli/cron.py
@@ -1,6 +1,4 @@
#
-# Copyright 2014 Apache Software Foundation
-#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
http://git-wip-us.apache.org/repos/asf/aurora/blob/ae4db02f/src/test/python/apache/aurora/client/cli/test_cron.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_cron.py b/src/test/python/apache/aurora/client/cli/test_cron.py
index 61690d7..2ab5b53 100644
--- a/src/test/python/apache/aurora/client/cli/test_cron.py
+++ b/src/test/python/apache/aurora/client/cli/test_cron.py
@@ -1,6 +1,4 @@
#
-# Copyright 2013 Apache Software Foundation
-#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at