You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sh...@apache.org on 2015/06/17 09:45:07 UTC
[1/2] falcon git commit: FALCON 1280 Update docs/license licenses
with right copyright information. Contributed by Shaik Idris Ali
Repository: falcon
Updated Branches:
refs/heads/master d23e232e9 -> 55ce6bb0a
FALCON 1280 Update docs/license licenses with right copyright information. Contributed by Shaik Idris Ali
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/a0e1c3a7
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/a0e1c3a7
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/a0e1c3a7
Branch: refs/heads/master
Commit: a0e1c3a77956755836da2c661d14c95d9aa56df3
Parents: 27e1d59
Author: shaik.idris <sh...@inmobi.com>
Authored: Wed Jun 17 13:12:22 2015 +0530
Committer: shaik.idris <sh...@inmobi.com>
Committed: Wed Jun 17 13:12:22 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +
docs/license/angular-ui-bootstrap-LICENSE.txt | 21 +++++
docs/license/angular-ui-router-LICENSE.txt | 21 +++++
docs/license/angularJS-LICENSE.txt | 22 ++++++
docs/license/bootstrap-LICENSE.txt | 11 +++
docs/license/entypo-font-LICENSE.txt | 92 ++++++++++++++++++++++
docs/license/entypo-icons-LICENSE.txt | 1 +
docs/license/jasmine-LICENSE.txt | 22 ++++++
8 files changed, 193 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 000d0c3..c80909a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -105,6 +105,9 @@ Branch: 0.6.1 (Proposed Release Version: 0.6.1)
FALCON-822 Add reverse look up API (Ajay Yadava via Suhas Vasu)
IMPROVEMENTS
+ FALCON-1280 Update docs/license licenses with right copyright
+ information (Shaik Idris Ali)
+
FALCON-1276 Verify licensing in html5-ui module.
(Shaik Idris Ali)
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/angular-ui-bootstrap-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/angular-ui-bootstrap-LICENSE.txt b/docs/license/angular-ui-bootstrap-LICENSE.txt
new file mode 100644
index 0000000..f61feea
--- /dev/null
+++ b/docs/license/angular-ui-bootstrap-LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2012-2015 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112
+
+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.
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/angular-ui-router-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/angular-ui-router-LICENSE.txt b/docs/license/angular-ui-router-LICENSE.txt
new file mode 100644
index 0000000..6413b09
--- /dev/null
+++ b/docs/license/angular-ui-router-LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2013-2015 The AngularUI Team, Karsten Sperling
+
+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.
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/angularJS-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/angularJS-LICENSE.txt b/docs/license/angularJS-LICENSE.txt
new file mode 100644
index 0000000..fbd4c1d
--- /dev/null
+++ b/docs/license/angularJS-LICENSE.txt
@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+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.
+
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/bootstrap-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/bootstrap-LICENSE.txt b/docs/license/bootstrap-LICENSE.txt
new file mode 100644
index 0000000..51fca54
--- /dev/null
+++ b/docs/license/bootstrap-LICENSE.txt
@@ -0,0 +1,11 @@
+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://www.apache.org/licenses/LICENSE-2.0
+
+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.
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/entypo-font-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/entypo-font-LICENSE.txt b/docs/license/entypo-font-LICENSE.txt
new file mode 100644
index 0000000..ab214f4
--- /dev/null
+++ b/docs/license/entypo-font-LICENSE.txt
@@ -0,0 +1,92 @@
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/entypo-icons-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/entypo-icons-LICENSE.txt b/docs/license/entypo-icons-LICENSE.txt
new file mode 100644
index 0000000..cc037df
--- /dev/null
+++ b/docs/license/entypo-icons-LICENSE.txt
@@ -0,0 +1 @@
+https://creativecommons.org/licenses/by-sa/3.0/legalcode
http://git-wip-us.apache.org/repos/asf/falcon/blob/a0e1c3a7/docs/license/jasmine-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/jasmine-LICENSE.txt b/docs/license/jasmine-LICENSE.txt
new file mode 100644
index 0000000..7f279f7
--- /dev/null
+++ b/docs/license/jasmine-LICENSE.txt
@@ -0,0 +1,22 @@
+/*
+Copyright (c) 2008-2014 Pivotal Labs
+
+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.
+*/
[2/2] falcon git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/falcon
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/falcon
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/55ce6bb0
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/55ce6bb0
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/55ce6bb0
Branch: refs/heads/master
Commit: 55ce6bb0ab3e81bbfdcd4de781f014cc6fa4aeb8
Parents: a0e1c3a d23e232
Author: shaik.idris <sh...@inmobi.com>
Authored: Wed Jun 17 13:13:22 2015 +0530
Committer: shaik.idris <sh...@inmobi.com>
Committed: Wed Jun 17 13:13:22 2015 +0530
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 10 +++
.../falcon/regression/InstanceParamTest.java | 2 +
.../falcon/regression/ProcessLateRerunTest.java | 15 ++--
.../apache/falcon/regression/SearchApiTest.java | 72 ++++++++++----------
.../regression/prism/PrismFeedUpdateTest.java | 2 +
.../prism/PrismProcessScheduleTest.java | 4 ++
6 files changed, 63 insertions(+), 42 deletions(-)
----------------------------------------------------------------------