You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/02/12 01:09:33 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1725] Missing
license information
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 8c5cce859 -> c8279d206
[TRAFODION-1725] Missing license information
More updates to license files from the reviews while releasing 1.3.
There was copyright info in code that was not reflected in top-level
license file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/37f320cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/37f320cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/37f320cc
Branch: refs/heads/master
Commit: 37f320ccc2fbbc609382094673ec8b775ec685cd
Parents: 8c955e6
Author: Steve Varnau <st...@esgyn.com>
Authored: Wed Feb 10 00:12:44 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Wed Feb 10 00:12:44 2016 +0000
----------------------------------------------------------------------
LICENSE | 4 ++++
licenses/LICENSE-bsd4 | 3 +++
licenses/LICENSE-jquery | 1 +
licenses/LICENSE-js | 1 +
4 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/37f320cc/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4d2621d..5a89653 100644
--- a/LICENSE
+++ b/LICENSE
@@ -218,6 +218,7 @@ BSD-4 for files:
Copyright (c) 1990 The Regents of the University of California.
Copyright (c) 1990, 1993 The Regents of the University of California.
+ This code is derived from software contributed to Berkeley by Chris Torek.
For details see incubator-trafodion/licenses/LICENSE-bsd4
@@ -259,6 +260,7 @@ MIT-Expat for files in:
Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte
(http://philogb.github.com/)
+ Copyright (c) 2006-2010 Valerio Proietti
For details see incubator-trafodion/licenses/LICENSE-js
@@ -279,8 +281,10 @@ For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING
MIT-Expat for files in:
incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui
+ incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js
Copyright 2014 jQuery Foundation and other contributors
+ (c) 2005, 2014 jQuery Foundation, Inc.
For details see incubator-trafodion/licenses/LICENSE-jquery
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/37f320cc/licenses/LICENSE-bsd4
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-bsd4 b/licenses/LICENSE-bsd4
index 2675dab..d952398 100644
--- a/licenses/LICENSE-bsd4
+++ b/licenses/LICENSE-bsd4
@@ -1,3 +1,6 @@
+ Copyright (c) 1990, 1993
+ The Regents of the University of California. All rights reserved.
+
This code is derived from software contributed to Berkeley by
Chris Torek.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/37f320cc/licenses/LICENSE-jquery
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-jquery b/licenses/LICENSE-jquery
index 60b21c0..b8fc975 100644
--- a/licenses/LICENSE-jquery
+++ b/licenses/LICENSE-jquery
@@ -1,4 +1,5 @@
Copyright 2014 jQuery Foundation and other contributors
+(c) 2005, 2014 jQuery Foundation, Inc.
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:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/37f320cc/licenses/LICENSE-js
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-js b/licenses/LICENSE-js
index b9b7736..fe7c6cb 100644
--- a/licenses/LICENSE-js
+++ b/licenses/LICENSE-js
@@ -1,4 +1,5 @@
Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/)
+Copyright (c) 2006-2010 Valerio Proietti
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1725] PR 315
Fix missing licence info
Posted by db...@apache.org.
Merge [TRAFODION-1725] PR 315 Fix missing licence info
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c8279d20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c8279d20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c8279d20
Branch: refs/heads/master
Commit: c8279d206e69f61bac3e1c22d18bfc924a9b7dfd
Parents: 8c5cce8 37f320c
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Feb 12 00:08:45 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Feb 12 00:08:45 2016 +0000
----------------------------------------------------------------------
LICENSE | 4 ++++
licenses/LICENSE-bsd4 | 3 +++
licenses/LICENSE-jquery | 1 +
licenses/LICENSE-js | 1 +
4 files changed, 9 insertions(+)
----------------------------------------------------------------------