Repository: hadoop Updated Branches: refs/heads/branch-2.9 ed0658a57 -> 12bd1aaac
HADOOP-15036. Update LICENSE.txt for HADOOP-14840. (asuresh) (cherry picked from commit f871b7541a5375eb117eafb9a091e4f59401231f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12bd1aaa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12bd1aaa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12bd1aaa Branch: refs/heads/branch-2.9 Commit: 12bd1aaac5b8862ea7c8ff4e47e61f34f379a327 Parents: ed0658a Author: Arun Suresh <asur...@apache.org> Authored: Mon Nov 13 14:37:36 2017 -0800 Committer: Arun Suresh <asur...@apache.org> Committed: Mon Nov 13 14:38:32 2017 -0800 ---------------------------------------------------------------------- LICENSE.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/12bd1aaa/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 25c3b30..23c63be 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -665,6 +665,31 @@ hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +-------------------------------------------------------------------------------- + +MIT License + +Copyright (c) 2003-2017 Optimatika + +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. + +For: oj! Algorithms - version 43.0 -------------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
