You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/05/26 17:11:15 UTC
[9/9] mesos git commit: Updated LICENSE information for protobuf
3.3.0.
Updated LICENSE information for protobuf 3.3.0.
Content copied from:
https://github.com/google/protobuf/blob/v3.3.0/LICENSE.
Review: https://reviews.apache.org/r/58361/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7b9863fa
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7b9863fa
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7b9863fa
Branch: refs/heads/master
Commit: 7b9863faf21ffa882b857d76c900fd76e36693ca
Parents: a03c22a
Author: Zhitao Li <zh...@gmail.com>
Authored: Fri May 26 10:02:07 2017 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Fri May 26 10:02:07 2017 -0700
----------------------------------------------------------------------
LICENSE | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7b9863fa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 1b3e72c..86a58c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -461,12 +461,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
======================================================================
-For protobuf-2.6.1
-(3rdparty/protobuf-2.6.1.tar.gz):
+For protobuf-3.3.0
+(3rdparty/protobuf-3.3.0.tar.gz):
======================================================================
-Copyright 2008, Google Inc.
-All rights reserved.
+This license applies to all parts of Protocol Buffers except the following:
+
+ - Atomicops support for generic gcc, located in
+ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.
+ This file is copyrighted by Red Hat Inc.
+
+ - Atomicops support for AIX/POWER, located in
+ src/google/protobuf/stubs/atomicops_internals_power.h.
+ This file is copyrighted by Bloomberg Finance LP.
+
+Copyright 2014, Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are