You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/05/24 21:32:21 UTC
[2/6] git commit: Fixed LICENSE and NOTICE.
Fixed LICENSE and NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/6e227d86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/6e227d86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/6e227d86
Branch: refs/heads/0.11.x
Commit: 6e227d869fe700e2c877b668369972899a62609f
Parents: cc53b34
Author: Vinod Kone <vi...@twitter.com>
Authored: Tue May 21 17:27:18 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Fri May 24 10:24:03 2013 -0700
----------------------------------------------------------------------
LICENSE | 2 +-
NOTICE | 26 +++++++++++++++++++++++++-
2 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/6e227d86/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..00d351a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright [yyyy] [name of copyright owner]
+ Copyright 2012-present 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.
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/6e227d86/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 6f9aee7..752c4f3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -36,7 +36,31 @@ DEALINGS IN THE SOFTWARE.
======================================================================
-For distribute-0.6.26:
+For boto (third_party/boto-2.0b2.zip):
+======================================================================
+
+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, dis-
+tribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the fol-
+lowing 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 MERCHANTABIL-
+ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHOR 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.
+
+
+======================================================================
+For distribute-0.6.26 (third_party/distribute-0.6.26.tar.gz):
======================================================================
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2