You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jf...@apache.org on 2014/07/25 18:45:51 UTC
git commit: AURORA-600:RC2 License and NOTICE updates
Repository: incubator-aurora
Updated Branches:
refs/heads/master 824f59d02 -> 3d976ab4c
AURORA-600:RC2 License and NOTICE updates
Updates LICENSE and NOTICE for comments found during RC2 review
Bugs closed: AURORA-600
Reviewed at https://reviews.apache.org/r/23931/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/3d976ab4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/3d976ab4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/3d976ab4
Branch: refs/heads/master
Commit: 3d976ab4c4639417be6379aa248facb4a9bdd922
Parents: 824f59d
Author: Jake Farrell <jf...@apache.org>
Authored: Fri Jul 25 12:45:34 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Fri Jul 25 12:45:34 2014 -0400
----------------------------------------------------------------------
LICENSE | 29 +++++++++++++++++------------
NOTICE | 4 ++--
2 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/3d976ab4/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8510f48..f6b6630 100644
--- a/LICENSE
+++ b/LICENSE
@@ -242,22 +242,27 @@ THE SOFTWARE.
Twitter Bootstrap (http://twitter.github.com/bootstrap)
Location: 3rdparty/javascript/bower_components/bootstrap.css
From: 'Twitter, Inc.' (http://www.twitter.com/)
- License: Apache License, Version 2.0
-
-Copyright 2012 Twitter, Inc.
+ License: MIT License
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this work except in compliance with the License.
-You may obtain a copy of the License in the LICENSE file, or at:
+Copyright (c) 2011-2014 Twitter, Inc
- http://www.apache.org/licenses/LICENSE-2.0
+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:
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+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.
-------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/3d976ab4/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 86fbd70..712c10a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Aurora
Copyright 2014 The Apache Software Foundation
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
\ No newline at end of file
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).